|
@@ -3798,17 +3798,13 @@ static void b43_set_retry_limits(struct b43_wldev *dev,
|
|
|
static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
|
|
|
{
|
|
|
struct b43_wl *wl = hw_to_b43_wl(hw);
|
|
|
- struct b43_wldev *dev;
|
|
|
- struct b43_phy *phy;
|
|
|
+ struct b43_wldev *dev = wl->current_dev;
|
|
|
+ struct b43_phy *phy = &dev->phy;
|
|
|
struct ieee80211_conf *conf = &hw->conf;
|
|
|
int antenna;
|
|
|
int err = 0;
|
|
|
- bool reload_bss = false;
|
|
|
|
|
|
mutex_lock(&wl->mutex);
|
|
|
-
|
|
|
- dev = wl->current_dev;
|
|
|
-
|
|
|
b43_mac_suspend(dev);
|
|
|
|
|
|
/* Switch the band (if necessary). This might change the active core. */
|
|
@@ -3816,15 +3812,6 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
|
|
|
if (err)
|
|
|
goto out_unlock_mutex;
|
|
|
|
|
|
- /* Need to reload all settings if the core changed */
|
|
|
- if (dev != wl->current_dev) {
|
|
|
- dev = wl->current_dev;
|
|
|
- changed = ~0;
|
|
|
- reload_bss = true;
|
|
|
- }
|
|
|
-
|
|
|
- phy = &dev->phy;
|
|
|
-
|
|
|
if (conf_is_ht(conf))
|
|
|
phy->is_40mhz =
|
|
|
(conf_is_ht40_minus(conf) || conf_is_ht40_plus(conf));
|
|
@@ -3881,9 +3868,6 @@ out_mac_enable:
|
|
|
out_unlock_mutex:
|
|
|
mutex_unlock(&wl->mutex);
|
|
|
|
|
|
- if (wl->vif && reload_bss)
|
|
|
- b43_op_bss_info_changed(hw, wl->vif, &wl->vif->bss_conf, ~0);
|
|
|
-
|
|
|
return err;
|
|
|
}
|
|
|
|