From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 30 Apr 2014 16:04:27 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f6595444c1ee798f9c227107bb3ab14730c6497a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
	net/mac80211/chan.c
---

f6595444c1ee798f9c227107bb3ab14730c6497a
diff --cc net/mac80211/chan.c
index 75b5dd2c9267,d8b1b8614842..48e6d6f010cd
--- a/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);
  	}