From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 22 Apr 2013 13:31:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless-next/master' into mac80211-next
X-Git-Tag: v4.0~4055^2~21^2^2~80^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a42c74ee608a424342ef7069ccddf196d873040c;p=platform%2Fkernel%2Flinux-amlogic.git

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

a42c74ee608a424342ef7069ccddf196d873040c
diff --cc net/mac80211/chan.c
index 166165ef,7d0baa8..03e8d2e
--- a/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);