diff options
| author | Arik Nemtsov <arik@wizery.com> | 2011-08-14 13:17:39 +0300 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-08-22 12:35:32 +0300 |
| commit | 04b4d69c89593d907d81a4aa33e4e42a632fe436 (patch) | |
| tree | 843bcd2efe9cdf80f4103d29f2a16d51653cb555 /drivers/net | |
| parent | 04216da393e1f6653cc99a58f2fa48d0dde417c0 (diff) | |
wl12xx: fix tx_queue_count spurious increment
Only increment the queue count after actually queuing the skb. This
avoids a spurious increment is case of dropped packets.
Also move the Tx-watermark checking code after the packet is enqueued.
This makes the count more accurate - it includes the just-queued
packet.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index b06ff0b25de1..82f4408e89ad 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -1485,18 +1485,6 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) spin_lock_irqsave(&wl->wl_lock, flags); - wl->tx_queue_count[q]++; - - /* - * The workqueue is slow to process the tx_queue and we need stop - * the queue here, otherwise the queue will get too long. - */ - if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK) { - wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q); - ieee80211_stop_queue(wl->hw, mapping); - set_bit(q, &wl->stopped_queues_map); - } - /* queue the packet */ if (wl->bss_type == BSS_TYPE_AP_BSS) { if (!wl1271_is_active_sta(wl, hlid)) { @@ -1512,6 +1500,18 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) skb_queue_tail(&wl->tx_queue[q], skb); } + wl->tx_queue_count[q]++; + + /* + * The workqueue is slow to process the tx_queue and we need stop + * the queue here, otherwise the queue will get too long. + */ + if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK) { + wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q); + ieee80211_stop_queue(wl->hw, mapping); + set_bit(q, &wl->stopped_queues_map); + } + /* * The chip specific setup must run before the first TX packet - * before that, the tx_work will not be initialized! |