Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Johannes Berg [Mon, 22 Apr 2013 13:31:43 +0000 (15:31 +0200)]
1  2 
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/rxon.c
net/mac80211/cfg.c
net/mac80211/chan.c
net/mac80211/ieee80211_i.h
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/wireless/nl80211.c

Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge