moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: Fix insufficient headroom issue for AMSDU

Browse Source 
[ Upstream commit f50d2ff8f0 ]

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: 6e0456b545 ("mac80211: add A-MSDU tx support")
Signed-off-by: Chih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://lore.kernel.org/r/20210816085128.10931-2-pkshih@realtek.com
[fix indentation]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chih-Kang Chang
2021-08-16 16:51:28 +08:00
committed by Greg Kroah-Hartman
parent 0ad4ddb27e
commit 22b106df73
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/tx.c
View File

@@ -3229,7 +3229,9 @@ static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
if (info->control.flags & IEEE80211_TX_CTRL_AMSDU) if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
return true; return true;
if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr))) if (!ieee80211_amsdu_realloc_pad(local, skb,
sizeof(*amsdu_hdr) +
local->hw.extra_tx_headroom))
return false; return false;
data = skb_push(skb, sizeof(*amsdu_hdr)); data = skb_push(skb, sizeof(*amsdu_hdr));