Commit 8cdc44aa authored by Arik Nemtsov's avatar Arik Nemtsov Committed by John W. Linville
Browse files

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: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 4a1ccce8

drivers/net/wireless/ti/wlcore/main.c

+3 −1
Original line number Diff line number Diff line
@@ -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);