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

Commit 2592adfe authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Greg Kroah-Hartman
Browse files

mac80211: do not convert to A-MSDU if frag/subframe limited 



[ Upstream commit 1eb507903665442360a959136dfa3234c43db085 ]

Do not start to aggregate packets in a A-MSDU frame (converting the
first subframe to A-MSDU, adding the header) if max_tx_fragments or
max_amsdu_subframes limits are already exceeded by it. In particular,
this happens when drivers set the limit to 1 to avoid A-MSDUs at all.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
[reword commit message to be more precise]
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 b22a5d20

net/mac80211/tx.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -3157,9 +3157,6 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, 
	if (skb->len + head->len > max_amsdu_len)

	if (skb->len + head->len > max_amsdu_len)

		goto out;

		goto out;





	if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))

		goto out;



	nfrags = 1 + skb_shinfo(skb)->nr_frags;

	nfrags = 1 + skb_shinfo(skb)->nr_frags;

	nfrags += 1 + skb_shinfo(head)->nr_frags;

	nfrags += 1 + skb_shinfo(head)->nr_frags;

	frag_tail = &skb_shinfo(head)->frag_list;

	frag_tail = &skb_shinfo(head)->frag_list;
@@ -3175,6 +3172,9 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, 
	if (max_frags && nfrags > max_frags)

	if (max_frags && nfrags > max_frags)

		goto out;

		goto out;





	if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))

		goto out;



	/*

	/*

	 * Pad out the previous subframe to a multiple of 4 by adding the

	 * Pad out the previous subframe to a multiple of 4 by adding the

	 * padding to the next one, that's being added. Note that head->len

	 * padding to the next one, that's being added. Note that head->len