Commit aa4c7b2a authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville

b43: check band width

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4bb29f8c
...@@ -3576,6 +3576,12 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed) ...@@ -3576,6 +3576,12 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
dev = wl->current_dev; dev = wl->current_dev;
phy = &dev->phy; 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); b43_mac_suspend(dev);
if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
......
...@@ -212,6 +212,9 @@ struct b43_phy { ...@@ -212,6 +212,9 @@ struct b43_phy {
bool supports_2ghz; bool supports_2ghz;
bool supports_5ghz; bool supports_5ghz;
/* HT info */
bool is_40mhz;
/* GMODE bit enabled? */ /* GMODE bit enabled? */
bool gmode; bool gmode;
......
...@@ -1787,7 +1787,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, ...@@ -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); 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; freq = 2500;
else else
freq = 5000; freq = 5000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment