|
@@ -3208,9 +3208,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;
|
|
@@ -3226,6 +3223,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
|