aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-04-27 13:06:18 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-30 20:34:27 -0400
commit2e35af143a1380173ba292e48e9b4913ef16b4ee (patch)
treeaeb6a164a32301c183a9dc84c1c2692d0d5efd05 /drivers
parent17f830459d6116ae13dbcfc9d09a406e6717b1a6 (diff)
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 94a0cdeb39a8..1e95c4f5256b 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)
4326 err = -EOPNOTSUPP; 4326 err = -EOPNOTSUPP;
4327 goto err_powerdown; 4327 goto err_powerdown;
4328 } 4328 }
4329 if (1 /* disable A-PHY */) {
4330 /* FIXME: For now we disable the A-PHY on multi-PHY devices. */
4331 if (dev->phy.type != B43_PHYTYPE_N) {
4332 have_2ghz_phy = 1;
4333 have_5ghz_phy = 0;
4334 }
4335 }
4336
4329 dev->phy.gmode = have_2ghz_phy; 4337 dev->phy.gmode = have_2ghz_phy;
4330 tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0; 4338 tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;
4331 b43_wireless_core_reset(dev, tmp); 4339 b43_wireless_core_reset(dev, tmp);