summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2010-12-07 21:55:59 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-12-08 15:38:45 -0500
commit82a52043c7801f83c7387deb45bf9323af04644b (patch)
treef145fdee86de74601d3abd0baeaf7c50b3413095
parentabc1f7cd531f80a8468ab654f1dfd35d58bd2490 (diff)
downloadlinux-3.10-82a52043c7801f83c7387deb45bf9323af04644b.tar.gz
linux-3.10-82a52043c7801f83c7387deb45bf9323af04644b.tar.bz2
linux-3.10-82a52043c7801f83c7387deb45bf9323af04644b.zip
b43: fix split of N-PHY devices into supported and not (based on PHY rev)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/main.c2
-rw-r--r--drivers/net/wireless/b43/phy_n.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 670fd7b782e..4d97aac38df 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4054,7 +4054,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
break;
#ifdef CONFIG_B43_NPHY
case B43_PHYTYPE_N:
- if (phy_rev > 4)
+ if (phy_rev > 2)
unsupported = 1;
break;
#endif
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 35173419d13..61875c88827 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3515,7 +3515,6 @@ int b43_phy_initn(struct b43_wldev *dev)
if (phy->rev >= 3)
b43_nphy_spur_workaround(dev);
- b43err(dev->wl, "IEEE 802.11n devices are not supported, yet.\n");
return 0;
}