evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

b43: b43_op_config: set channel info before switching band

Browse source 
Band switching code needs to know what channel we switch to.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki 2014-05-31 20:49:37 +02:00 • committed by John W. Linville
parent eb530b0fed
commit f9471e9973
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/b43/main.c
View file

@ -3808,6 +3808,7 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
b43_mac_suspend(dev); b43_mac_suspend(dev);
if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
phy->channel = conf->chandef.chan->hw_value;
if (conf_is_ht(conf)) if (conf_is_ht(conf))
phy->is_40mhz = conf_is_ht40_minus(conf) || phy->is_40mhz = conf_is_ht40_minus(conf) ||
conf_is_ht40_plus(conf); conf_is_ht40_plus(conf);
@ -3822,7 +3823,7 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
/* Switch to the requested channel. /* Switch to the requested channel.
* The firmware takes care of races with the TX handler. * The firmware takes care of races with the TX handler.
*/ */
b43_switch_channel(dev, conf->chandef.chan->hw_value); b43_switch_channel(dev, phy->channel);
} }
if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS)

1
drivers/net/wireless/b43/phy_common.c
View file

@ -424,7 +424,6 @@ int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel)
if (err) if (err)
goto err_restore_cookie; goto err_restore_cookie;
dev->phy.channel = new_channel;
/* Wait for the radio to tune to the channel and stabilize. */ /* Wait for the radio to tune to the channel and stabilize. */
msleep(8); msleep(8);