From 91770e76d9ed599d62f2f97c2764270320194dc4 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Fri, 20 Feb 2009 14:27:15 +0100
Subject: [PATCH] --- yaml --- r: 134907 b: refs/heads/master c:
 969d15cfab52c0af40c617fcbcc54cad6eaa4b32 h: refs/heads/master i:   134905:
 401b4d0f7a632e2194d3e23fdf0e38691424f5d2   134903:
 64a13bbdbb9bc2f2157feff315b3bc94eccd2926 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/wireless/b43/main.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 68cce19ad94b..7748bcc50916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d071ca50e9f20bf0203a7e8dbb1c784934e324d
+refs/heads/master: 969d15cfab52c0af40c617fcbcc54cad6eaa4b32
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 7116ab6eccfa..390ce140637d 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/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);