b43: store current channel using struct cfg80211_chan_def

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

3 files changed, 9 insertions, 2 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 5e4eed37e3ce..2b99ed31ab08 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3808,6 +3808,7 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         b43_mac_suspend(dev);
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+                phy->chandef = &conf->chandef;
                 phy->channel = conf->chandef.chan->hw_value;
                 if (conf_is_ht(conf))
                         phy->is_40mhz = conf_is_ht40_minus(conf) ||
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index b465011c14ea..9aa6c9c57393 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -94,8 +94,13 @@ int b43_phy_init(struct b43_wldev *dev)
         const struct b43_phy_operations *ops = phy->ops;
         int err;
 
-        if (!phy->channel)
-                phy->channel = ops->get_default_chan(dev);
+        /* During PHY init we need to use some channel. On the first init this
+         * function is called *before* b43_op_config, so our pointer is NULL.
+         */
+        if (!phy->chandef) {
+                phy->chandef = &dev->wl->hw->conf.chandef;
+                phy->channel = phy->chandef->chan->hw_value;
+        }
 
         phy->ops->switch_analog(dev, true);
         b43_software_rfkill(dev, false);
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index 9a92df46ae84..56dfe7aa50a7 100644
--- a/drivers/net/wireless/b43/phy_common.h
+++ b/drivers/net/wireless/b43/phy_common.h
@@ -267,6 +267,7 @@ struct b43_phy {
         unsigned long next_txpwr_check_time;
 
         /* Current channel */
+        struct cfg80211_chan_def *chandef;
         unsigned int channel;
         u16 channel_freq;
         enum nl80211_channel_type channel_type;