summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-04-27 19:06:18 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-04-30 20:34:27 -0400
commit2e35af143a1380173ba292e48e9b4913ef16b4ee (patch)
treeaeb6a164a32301c183a9dc84c1c2692d0d5efd05 /drivers
parent17f830459d6116ae13dbcfc9d09a406e6717b1a6 (diff)
downloadlinux-3.10-2e35af143a1380173ba292e48e9b4913ef16b4ee.tar.gz
linux-3.10-2e35af143a1380173ba292e48e9b4913ef16b4ee.tar.bz2
linux-3.10-2e35af143a1380173ba292e48e9b4913ef16b4ee.zip
b43: Fix dual-PHY devices
This fixes operation of dual-PHY (A/B/G) devices. Do not anounce the A-PHY to mac80211, as that's not supported, yet. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/b43/main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 94a0cdeb39a..1e95c4f5256 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4326,6 +4326,14 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
err = -EOPNOTSUPP;
goto err_powerdown;
}
+ if (1 /* disable A-PHY */) {
+ /* FIXME: For now we disable the A-PHY on multi-PHY devices. */
+ if (dev->phy.type != B43_PHYTYPE_N) {
+ have_2ghz_phy = 1;
+ have_5ghz_phy = 0;
+ }
+ }
+
dev->phy.gmode = have_2ghz_phy;
tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;
b43_wireless_core_reset(dev, tmp);