Merge remote-tracking branch 'mac80211-next/master'

diff --cc drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

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

diff --cc drivers/net/wireless/ralink/rt2x00/rt2800lib.c
Simple merge

diff --cc net/mac80211/agg-rx.c
index 367784be5df20f26fd3940c4608f1ea715bfddd6,1b8a5caa221eb6a2554a95fdfb2a53ea7f17d9c3..3a8f881b22f10c983ab354a4393157e090fd6d3a
--- 1/net/mac80211/agg-rx.c
--- 2/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@@ -290,8 -316,18 +316,18 @@@ void __ieee80211_start_rx_ba_session(st
                                                false);
        }
  
+       if (ieee80211_hw_check(&local->hw, SUPPORTS_REORDERING_BUFFER)) {
+               ret = drv_ampdu_action(local, sta->sdata, &params);
+               ht_dbg(sta->sdata,
+                      "Rx A-MPDU request on %pM tid %d result %d\n",
+                      sta->sta.addr, tid, ret);
+               if (!ret)
+                       status = WLAN_STATUS_SUCCESS;
+               goto end;
+       }
+ 
        /* prepare A-MPDU MLME for Rx aggregation */
 -      tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);
 +      tid_agg_rx = kzalloc(sizeof(*tid_agg_rx), GFP_KERNEL);
        if (!tid_agg_rx)
                goto end;
  

diff --cc net/mac80211/debugfs.c
index 3e24d0ddb51bfaca18d39669e41dba2bb6a91bb5,e433d0c97e86118394cd39c663f3531fd1145a75..4ab5c522ceeeee5def93f869fd96618999a2daf5
--- 1/net/mac80211/debugfs.c
--- 2/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@@ -126,6 -126,10 +126,7 @@@ static const char *hw_flag_names[] = 
        FLAG(SUPPORTS_AMSDU_IN_AMPDU),
        FLAG(BEACON_TX_STATUS),
        FLAG(NEEDS_UNIQUE_STA_ADDR),
 -
 -      /* keep last for the build bug below */
 -      (void *)0x1
+       FLAG(SUPPORTS_REORDERING_BUFFER),
  #undef FLAG
  };
  

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

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

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

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

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

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

diff --cc net/rfkill/core.c
Simple merge

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

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