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

diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge

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

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

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

diff --cc net/mac80211/chan.c
index 166165efd8e223fea88f49cd341fafc0117e4690,7d0baa89c784888926b98d2a84fc329f04c75122..03e8d2e3270e23f0e97a58595513b33fcb048cb3
--- 1/net/mac80211/chan.c
--- 2/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@@ -91,10 -76,14 +92,17 @@@ ieee80211_new_chanctx(struct ieee80211_
        ctx->conf.rx_chains_static = 1;
        ctx->conf.rx_chains_dynamic = 1;
        ctx->mode = mode;
 +      ctx->conf.radar_enabled = ieee80211_is_radar_required(local);
 +      if (!local->use_chanctx)
 +              local->hw.conf.radar_enabled = ctx->conf.radar_enabled;
  
+       /* acquire mutex to prevent idle from changing */
+       mutex_lock(&local->mtx);
+       /* turn idle off *before* setting channel -- some drivers need that */
+       changed = ieee80211_idle_off(local);
+       if (changed)
+               ieee80211_hw_config(local, changed);
+ 
        if (!local->use_chanctx) {
                local->_oper_chandef = *chandef;
                ieee80211_hw_config(local, 0);

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

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

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

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

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