Merge tag 'mac80211-next-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux...

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 <davem@davemloft.net>

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/mac80211/driver-ops.h
Simple merge

diff --cc net/mac80211/key.c
Simple merge

diff --cc net/mac80211/mesh_pathtbl.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/tx.c
index 2e816dd67be72d161bf1959554d293f2f6725673,8037384fc06e07a4ea22b6c7877bfd03ec19b9af..dd220b977025cb8149fb91af86a838e376037970
--- 1/net/mac80211/tx.c
--- 2/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;

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge

diff --cc net/wireless/scan.c
Simple merge

diff --cc net/wireless/util.c
Simple merge