Do not try to aggregate packets in a A-MSDU frame and add A-MSDU header on the first packet if max_tx_fragments or max_amsdu_subframes are set to one Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@xxxxxxxxxx> --- Changes since v1: - rebased on top of mac80211 master branch - removed ieee80211_amsdu_realloc_pad chunk --- net/mac80211/tx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 6a362b2882d3..75646e3fb3d9 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3213,9 +3213,6 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, if (skb->len + head->len > max_amsdu_len) goto out; - if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head)) - goto out; - nfrags = 1 + skb_shinfo(skb)->nr_frags; nfrags += 1 + skb_shinfo(head)->nr_frags; frag_tail = &skb_shinfo(head)->frag_list; @@ -3231,6 +3228,9 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, if (max_frags && nfrags > max_frags) 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 * padding to the next one, that's being added. Note that head->len -- 2.17.1
