aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2012-06-25 15:26:17 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-07-10 12:10:12 -0400
commit8cdc44aab2dd83cf09512c7b64287e5f54bf117b (patch)
tree5f2e098ae435eebfc0f0e013170bb835a7ddeb7e
parent4a1ccce852882c174d2392d2d8db1d65f48d4a10 (diff)
wlcore: don't stop tx queue via watermark if already stopped
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>
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 0cc9a0240220..7abb02ad1b37 100644
--- 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)
1211 * The workqueue is slow to process the tx_queue and we need stop 1211 * The workqueue is slow to process the tx_queue and we need stop
1212 * the queue here, otherwise the queue will get too long. 1212 * the queue here, otherwise the queue will get too long.
1213 */ 1213 */
1214 if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK) { 1214 if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK &&
1215 !wlcore_is_queue_stopped_by_reason(wl, q,
1216 WLCORE_QUEUE_STOP_REASON_WATERMARK)) {
1215 wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q); 1217 wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q);
1216 wlcore_stop_queue_locked(wl, q, 1218 wlcore_stop_queue_locked(wl, q,
1217 WLCORE_QUEUE_STOP_REASON_WATERMARK); 1219 WLCORE_QUEUE_STOP_REASON_WATERMARK);