aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/main.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-07-19 06:52:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-07-22 13:53:18 -0400
commitc11082f0c00acde7c9049e92dbcafd1f73fb60e6 (patch)
tree6bdac3ccfaf45314de6adba1e2e507708f0abbfd /drivers/net/wireless/b43/main.c
parent5af976295eab35b3bb4ad1fc9ed24b2d12930f9a (diff)
b43: enable radio 0x2057 rev 14 support (AKA BCM43217)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r--drivers/net/wireless/b43/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 3e127be06bfb..73f629ccfa0f 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4512,7 +4512,8 @@ static int b43_phy_versioning(struct b43_wldev *dev)
4512 if (radio_ver != 0x2055 && radio_ver != 0x2056 && 4512 if (radio_ver != 0x2055 && radio_ver != 0x2056 &&
4513 radio_ver != 0x2057) 4513 radio_ver != 0x2057)
4514 unsupported = 1; 4514 unsupported = 1;
4515 if (radio_ver == 0x2057 && !(radio_rev == 9)) 4515 if (radio_ver == 0x2057 &&
4516 !(radio_rev == 9 || radio_rev == 14))
4516 unsupported = 1; 4517 unsupported = 1;
4517 break; 4518 break;
4518 case B43_PHYTYPE_LP: 4519 case B43_PHYTYPE_LP:
@@ -5152,7 +5153,8 @@ static int b43_setup_bands(struct b43_wldev *dev,
5152 bool limited_2g; 5153 bool limited_2g;
5153 5154
5154 /* We don't support all 2 GHz channels on some devices */ 5155 /* We don't support all 2 GHz channels on some devices */
5155 limited_2g = phy->radio_ver == 0x2057 && phy->radio_rev == 9; 5156 limited_2g = phy->radio_ver == 0x2057 &&
5157 (phy->radio_rev == 9 || phy->radio_rev == 14);
5156 5158
5157 if (have_2ghz_phy) 5159 if (have_2ghz_phy)
5158 hw->wiphy->bands[IEEE80211_BAND_2GHZ] = limited_2g ? 5160 hw->wiphy->bands[IEEE80211_BAND_2GHZ] = limited_2g ?