b43: check band width

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

3 files changed, 10 insertions, 1 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c699e46534dc..6d7cf3c2f7bf 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3576,6 +3576,12 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         dev = wl->current_dev;
         phy = &dev->phy;
 
+        if (conf_is_ht(conf))
+                phy->is_40mhz =
+                        (conf_is_ht40_minus(conf) || conf_is_ht40_plus(conf));
+        else
+                phy->is_40mhz = false;
+
         b43_mac_suspend(dev);
 
         if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index 9edd4e8e0c85..f635f9e4f83d 100644
--- a/drivers/net/wireless/b43/phy_common.h
+++ b/drivers/net/wireless/b43/phy_common.h
@@ -212,6 +212,9 @@ struct b43_phy {
         bool supports_2ghz;
         bool supports_5ghz;
 
+        /* HT info */
+        bool is_40mhz;
+
         /* GMODE bit enabled? */
         bool gmode;
 
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index e77f1f24d101..2cdf32e5fd9b 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -1787,7 +1787,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,
 
         b43_phy_write(dev, B43_NPHY_IQLOCAL_CMDGCTL, 0x8AA9);
 
-        if (1 /* FIXME: the band width is 20 MHz */)
+        if (!dev->phy.is_40mhz)
                 freq = 2500;
         else
                 freq = 5000;