diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-10-17 14:02:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-10-17 14:02:07 -0400 |
commit | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch) | |
tree | 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /net/mac80211/chan.c | |
parent | ccdbb6e96beca362db876d820ac1e560ff6d9579 (diff) | |
parent | b6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff) | |
download | linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/chan.c')
-rw-r--r-- | net/mac80211/chan.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 3a4764b2869e..03ba6b5c5373 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -453,11 +453,6 @@ int ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata, chanctx_changed |= IEEE80211_CHANCTX_CHANGE_CHANNEL; drv_change_chanctx(local, ctx, chanctx_changed); - if (!local->use_chanctx) { - local->_oper_chandef = *chandef; - ieee80211_hw_config(local, 0); - } - ieee80211_recalc_chanctx_chantype(local, ctx); ieee80211_recalc_smps_chanctx(local, ctx); ieee80211_recalc_radar_chanctx(local, ctx); |