Skip to content

Commit f50d2ff

Browse files
Chih-Kang Changjmberg-intel
authored andcommitted
mac80211: Fix insufficient headroom issue for AMSDU
ieee80211_amsdu_realloc_pad() fails to account for extra_tx_headroom, the original reserved headroom might be eaten. Add the necessary extra_tx_headroom. Fixes: 6e0456b ("mac80211: add A-MSDU tx support") Signed-off-by: Chih-Kang Chang <[email protected]> Signed-off-by: Ping-Ke Shih <[email protected]> Link: https://lore.kernel.org/r/[email protected] [fix indentation] Signed-off-by: Johannes Berg <[email protected]>
1 parent 5f9404a commit f50d2ff

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

net/mac80211/tx.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3242,7 +3242,9 @@ static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
32423242
if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
32433243
return true;
32443244

3245-
if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr)))
3245+
if (!ieee80211_amsdu_realloc_pad(local, skb,
3246+
sizeof(*amsdu_hdr) +
3247+
local->hw.extra_tx_headroom))
32463248
return false;
32473249

32483250
data = skb_push(skb, sizeof(*amsdu_hdr));

0 commit comments

Comments
 (0)