diff options
author | Michael Buesch <mb@bu3sch.de> | 2009-02-20 14:27:15 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:50 -0500 |
commit | 969d15cfab52c0af40c617fcbcc54cad6eaa4b32 (patch) | |
tree | 1b049b480de6ca91f0e6d96650e36d1496d15c20 /drivers/net/wireless/b43/main.c | |
parent | 2d071ca50e9f20bf0203a7e8dbb1c784934e324d (diff) | |
download | lwn-969d15cfab52c0af40c617fcbcc54cad6eaa4b32.tar.gz lwn-969d15cfab52c0af40c617fcbcc54cad6eaa4b32.zip |
b43: Fix radio host flags
This fixes initialization of some radio related hostflags.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
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.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 7116ab6eccfa..390ce140637d 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -4170,10 +4170,12 @@ static int b43_wireless_core_init(struct b43_wldev *dev) hf |= B43_HF_GDCW; if (sprom->boardflags_lo & B43_BFL_PACTRL) hf |= B43_HF_OFDMPABOOST; - } else if (phy->type == B43_PHYTYPE_B) { - hf |= B43_HF_SYMW; - if (phy->rev >= 2 && phy->radio_ver == 0x2050) - hf &= ~B43_HF_GDCW; + } + if (phy->radio_ver == 0x2050) { + if (phy->radio_rev == 6) + hf |= B43_HF_4318TSSI; + if (phy->radio_rev < 6) + hf |= B43_HF_VCORECALC; } b43_hf_write(dev, hf); |