From: David S. Miller Date: Fri, 26 Apr 2019 20:05:52 +0000 (-0400) Subject: Merge tag 'mac80211-next-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=30e5a9a5ba853b896250f0665a2e10bbafa2f6bc;p=linux.git Merge tag 'mac80211-next-for-davem-2019-04-26' of git://git./linux/kernel/git/jberg/mac80211-next Johannes Berg says: ==================== Various updates, notably: * extended key ID support (from 802.11-2016) * per-STA TX power control support * mac80211 TX performance improvements * HE (802.11ax) updates * mesh link probing support * enhancements of multi-BSSID support (also related to HE) * OWE userspace processing support ==================== Signed-off-by: David S. Miller --- 30e5a9a5ba853b896250f0665a2e10bbafa2f6bc diff --cc net/mac80211/tx.c index 2e816dd67be72,8037384fc06e0..dd220b977025c --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@@ -3221,7 -3228,7 +3228,8 @@@ static bool ieee80211_amsdu_aggregate(s u8 max_subframes = sta->sta.max_amsdu_subframes; int max_frags = local->hw.max_tx_fragments; int max_amsdu_len = sta->sta.max_amsdu_len; + int orig_truesize; + u32 flow_idx; __be16 len; void *data; bool ret = false;