mac80211: always account for A-MSDU header changes
authorJohannes Berg <johannes.berg@intel.com>
Thu, 30 Aug 2018 08:55:49 +0000 (10:55 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 30 Aug 2018 09:04:19 +0000 (11:04 +0200)
commitaa58acf325b4aadeecae2bfc90658273b47dbace
treeb9d4a712b33cc174719a83332ca772a8e542ca66
parent1eb507903665442360a959136dfa3234c43db085
mac80211: always account for A-MSDU header changes

In the error path of changing the SKB headroom of the second
A-MSDU subframe, we would not account for the already-changed
length of the first frame that just got converted to be in
A-MSDU format and thus is a bit longer now.

Fix this by doing the necessary accounting.

It would be possible to reorder the operations, but that would
make the code more complex (to calculate the necessary pad),
and the headroom expansion should not fail frequently enough
to make that worthwhile.

Fixes: 6e0456b54545 ("mac80211: add A-MSDU tx support")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/tx.c