Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b4d69c authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

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: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 04216da3

drivers/net/wireless/wl12xx/main.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -1485,18 +1485,6 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 




	spin_lock_irqsave(&wl->wl_lock, flags);

	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 */

	/* queue the packet */

	if (wl->bss_type == BSS_TYPE_AP_BSS) {

	if (wl->bss_type == BSS_TYPE_AP_BSS) {

		if (!wl1271_is_active_sta(wl, hlid)) {

		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);

		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 -

	 * The chip specific setup must run before the first TX packet -

	 * before that, the tx_work will not be initialized!

	 * before that, the tx_work will not be initialized!