projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a1ccce
)
wlcore: don't stop tx queue via watermark if already stopped
author
Arik Nemtsov
<arik@wizery.com>
Mon, 25 Jun 2012 19:26:17 +0000
(22:26 +0300)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 10 Jul 2012 16:10:12 +0000
(12:10 -0400)
If a Tx queue is currently stopped because of our Tx watermark flow
control, don't stop it again. This causes a warning to appear.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/ti/wlcore/main.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ti/wlcore/main.c
b/drivers/net/wireless/ti/wlcore/main.c
index 0cc9a0240220bdc4c5fb3bb05ff8ad064548d891..7abb02ad1b372eb33f79bb67bfe048dc9a147d02 100644
(file)
--- a/
drivers/net/wireless/ti/wlcore/main.c
+++ b/
drivers/net/wireless/ti/wlcore/main.c
@@
-1211,7
+1211,9
@@
static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
* 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) {
+ if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK &&
+ !wlcore_is_queue_stopped_by_reason(wl, q,
+ WLCORE_QUEUE_STOP_REASON_WATERMARK)) {
wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q);
wlcore_stop_queue_locked(wl, q,
WLCORE_QUEUE_STOP_REASON_WATERMARK);