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

Commit 50e9f746 authored by Ido Yariv's avatar Ido Yariv Committed by Luciano Coelho
Browse files

wl12xx: Remove private headers in wl1271_tx_reset 



Frames in the tx_frames array include extra private headers, which must
be removed before passing the skbs to ieee80211_tx_status.

Fix this by removing any private headers in wl1271_tx_reset, similar to
how this is done in wl1271_tx_complete_packet.

Signed-off-by: default avatarIdo Yariv <ido@wizery.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 11251e7e

drivers/net/wireless/wl12xx/tx.c

+23 −9
Original line number Diff line number Diff line
@@ -687,14 +687,28 @@ void wl1271_tx_reset(struct wl1271 *wl) 
	 */

	wl1271_handle_tx_low_watermark(wl);



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

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

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

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

			continue;



		skb = wl->tx_frames[i];

		wl1271_free_tx_id(wl, i);

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



		/* Remove private headers before passing the skb to mac80211 */

		info = IEEE80211_SKB_CB(skb);

		skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));

		if (info->control.hw_key &&

		    info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP) {

			int hdrlen = ieee80211_get_hdrlen_from_skb(skb);

			memmove(skb->data + WL1271_TKIP_IV_SPACE, skb->data,

				hdrlen);

			skb_pull(skb, WL1271_TKIP_IV_SPACE);

		}



		info->status.rates[0].idx = -1;

		info->status.rates[0].count = 0;



		ieee80211_tx_status(wl->hw, skb);

	}

}