Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

Conflicts:
	net/mac80211/chan.c

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

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

diff --cc net/mac80211/chan.c
index 75b5dd2c9267f10e8cb0e5680c3aa11c94a5dbe4,d8b1b861484259a426e91ad12d5dbe0ac17f784b..48e6d6f010cd0f26acd379fea0c601bf8d67e33f
--- 1/net/mac80211/chan.c
--- 2/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@@ -248,8 -428,8 +428,8 @@@ static int ieee80211_add_chanctx(struc
                ieee80211_hw_config(local, changed);
  
        if (!local->use_chanctx) {
-               local->_oper_chandef = *chandef;
+               local->_oper_chandef = ctx->conf.def;
 -              ieee80211_hw_config(local, 0);
 +              ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
        } else {
                err = drv_add_chanctx(local, ctx);
                if (err) {
@@@ -282,11 -480,12 +480,12 @@@ static void ieee80211_del_chanctx(struc
                /* NOTE: Disabling radar is only valid here for
                 * single channel context. To be sure, check it ...
                 */
-               if (local->hw.conf.radar_enabled)
-                       check_single_channel = true;
+               WARN_ON(local->hw.conf.radar_enabled &&
+                       !list_empty(&local->chanctx_list));
+ 
                local->hw.conf.radar_enabled = false;
  
 -              ieee80211_hw_config(local, 0);
 +              ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
        } else {
                drv_remove_chanctx(local, ctx);
        }

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