diff options
author | Michael Buesch <mb@bu3sch.de> | 2008-05-01 12:31:44 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-09 21:40:48 -0700 |
commit | a315960a1eadf634004607f981412981c8b2fc9a (patch) | |
tree | b05a20d64f47bfc8037a0e605e030cc9973c971e | |
parent | 6981f54bdc1416f5172aa42db8cf8f83cc251c8a (diff) | |
download | lwn-a315960a1eadf634004607f981412981c8b2fc9a.tar.gz lwn-a315960a1eadf634004607f981412981c8b2fc9a.zip |
b43: Fix dual-PHY devices
commit 2e35af143a1380173ba292e48e9b4913ef16b4ee upstream
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/net/wireless/b43/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index f23317e98be6..b47937d93457 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -3912,6 +3912,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); |