From: Rafał Miłecki <zajec5@gmail.com>
Date: Fri, 22 Oct 2010 15:43:48 +0000 (+0200)
Subject: b43: N-PHY: determine usage of radio regulatory workaround correctly
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b;p=deliverable%2Flinux.git

b43: N-PHY: determine usage of radio regulatory workaround correctly

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index e0f2d122e124..c22dbfb987de 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -191,7 +191,8 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
 				binfo->type != 0x46D ||
 				binfo->rev < 0x41);
 	else
-		workaround = ((sprom->boardflags_hi & B43_BFH_NOPA) == 0);
+		workaround =
+			!(sprom->boardflags2_lo & B43_BFL2_RXBB_INT_REG_DIS);
 
 	b43_radio_mask(dev, B2055_MASTER1, 0xFFF3);
 	if (workaround) {