---

yaml --- r: 134907 b: refs/heads/master c: 969d15c h: refs/heads/master i: 134905: 401b4d0 134903: 64a13bb v: v3
git-mirror · Feb 27, 2009 · 91770e7 · 91770e7
1 parent 5fdcdf3
commit 91770e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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);