b43: b43_op_config: use IEEE80211_CONF_CHANGE_CHANNEL

This is tiny optimization and grouping band/channel ops.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index a9e50ee125fa3f1bf3b558ef8fb9d8cb0a7d8b96..59aa4fdb2aebe73cde3e5c48a160c203a571fe78 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3807,16 +3807,23 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
        mutex_lock(&wl->mutex);
        b43_mac_suspend(dev);
 
-       /* Switch the band (if necessary). This might change the active core. */
-       err = b43_switch_band(dev, conf->chandef.chan);
-       if (err)
-               goto out_unlock_mutex;
+       if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+               if (conf_is_ht(conf))
+                       phy->is_40mhz = conf_is_ht40_minus(conf) ||
+                                       conf_is_ht40_plus(conf);
+               else
+                       phy->is_40mhz = false;
 
-       if (conf_is_ht(conf))
-               phy->is_40mhz =
-                       (conf_is_ht40_minus(conf) || conf_is_ht40_plus(conf));
-       else
-               phy->is_40mhz = false;
+               /* Switch the band (if necessary). */
+               err = b43_switch_band(dev, conf->chandef.chan);
+               if (err)
+                       goto out_mac_enable;
+
+               /* Switch to the requested channel.
+                * The firmware takes care of races with the TX handler.
+                */
+               b43_switch_channel(dev, conf->chandef.chan->hw_value);
+       }
 
        if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
                b43_set_retry_limits(dev, conf->short_frame_max_tx_count,
@@ -3825,11 +3832,6 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
        if (!changed)
                goto out_mac_enable;
 
-       /* Switch to the requested channel.
-        * The firmware takes care of races with the TX handler. */
-       if (conf->chandef.chan->hw_value != phy->channel)
-               b43_switch_channel(dev, conf->chandef.chan->hw_value);
-
        dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_MONITOR);
 
        /* Adjust the desired TX power level. */
@@ -3865,7 +3867,6 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
 
 out_mac_enable:
        b43_mac_enable(dev);
-out_unlock_mutex:
        mutex_unlock(&wl->mutex);
 
        return err;