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

Commit 43a01409 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Greg Kroah-Hartman
Browse files

mac80211: fix an off-by-one issue in A-MSDU max_subframe computation 



[ Upstream commit 66eb02d8 ]

Initialize 'n' to 2 in order to take into account also the first
packet in the estimation of max_subframe limit for a given A-MSDU
since frag_tail pointer is NULL when ieee80211_amsdu_aggregate
routine analyzes the second frame.

Fixes: 6e0456b5 ("mac80211: add A-MSDU tx support")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25cb8544

net/mac80211/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -3123,7 +3123,7 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, 
	void *data;

	bool ret = false;

	unsigned int orig_len;

	int n = 1, nfrags, pad = 0;

	int n = 2, nfrags, pad = 0;

	u16 hdrlen;



	if (!ieee80211_hw_check(&local->hw, TX_AMSDU))