aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/main.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-06-29 15:46:45 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-07-01 14:26:26 -0400
commitb49c3caf5ef1476895f92ea5fac0b6bd48854628 (patch)
tree83578da628fdcea12f79a31c0d06a3071dfc2f21 /drivers/net/wireless/b43/main.c
parentf528f664d61cdb87fe12eb24ed9b05548a3e71b3 (diff)
b43: treat LCNXN-PHY as extra N-PHY devices
LCNXN is simply a continuation of N, e.g. code handling LCNXN revs 0 and 1 is mostly the same as for N-PHY revs 7+. 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.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index aae3af2a7a9f..3740b76162f9 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4331,6 +4331,13 @@ static int b43_phy_versioning(struct b43_wldev *dev)
4331 analog_type = (tmp & B43_PHYVER_ANALOG) >> B43_PHYVER_ANALOG_SHIFT; 4331 analog_type = (tmp & B43_PHYVER_ANALOG) >> B43_PHYVER_ANALOG_SHIFT;
4332 phy_type = (tmp & B43_PHYVER_TYPE) >> B43_PHYVER_TYPE_SHIFT; 4332 phy_type = (tmp & B43_PHYVER_TYPE) >> B43_PHYVER_TYPE_SHIFT;
4333 phy_rev = (tmp & B43_PHYVER_VERSION); 4333 phy_rev = (tmp & B43_PHYVER_VERSION);
4334
4335 /* LCNXN is continuation of N which run out of revisions */
4336 if (phy_type == B43_PHYTYPE_LCNXN) {
4337 phy_type = B43_PHYTYPE_N;
4338 phy_rev += 16;
4339 }
4340
4334 switch (phy_type) { 4341 switch (phy_type) {
4335#ifdef CONFIG_B43_PHY_G 4342#ifdef CONFIG_B43_PHY_G
4336 case B43_PHYTYPE_G: 4343 case B43_PHYTYPE_G: