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

Commit 6bbe89de authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Fix tx queue flushing 



This patch modifies tx-queue flushing to correspond with tx-path - i.e.
also frames for which no ack was requested are forwarded to the mac80211
for disposal.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1a186a51

drivers/net/wireless/wl12xx/wl1271_tx.c

+1 −17
Original line number Diff line number Diff line
@@ -416,35 +416,19 @@ void wl1271_tx_flush(struct wl1271 *wl) 
{

	int i;

	struct sk_buff *skb;

	struct ieee80211_tx_info *info;



	/* TX failure */

/* 	control->flags = 0; FIXME */



	while ((skb = skb_dequeue(&wl->tx_queue))) {

		info = IEEE80211_SKB_CB(skb);



		wl1271_debug(DEBUG_TX, "flushing skb 0x%p", skb);



		if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {

			kfree_skb(skb);

			continue;

		}



		ieee80211_tx_status(wl->hw, skb);

	}



	for (i = 0; i < ACX_TX_DESCRIPTORS; i++)

		if (wl->tx_frames[i] != NULL) {

			skb = wl->tx_frames[i];

			info = IEEE80211_SKB_CB(skb);



			if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {

				kfree_skb(skb);

				continue;

			}



			ieee80211_tx_status(wl->hw, skb);

			wl->tx_frames[i] = NULL;

			ieee80211_tx_status(wl->hw, skb);

		}

}