From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 24 Dec 2008 14:26:40 +0000 (+0100)
Subject: b43: detect N PHY revision/radio
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bb519bee07eed4fac9921ad658fb1f7ed78defb5;p=deliverable%2Flinux.git

b43: detect N PHY revision/radio

Does nothing unless you enable the hidden N PHY config.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index a2b1e375f83c..26e733a5a56e 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3752,7 +3752,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
 		break;
 #ifdef CONFIG_B43_NPHY
 	case B43_PHYTYPE_N:
-		if (phy_rev > 1)
+		if (phy_rev > 4)
 			unsupported = 1;
 		break;
 #endif
@@ -3805,7 +3805,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
 			unsupported = 1;
 		break;
 	case B43_PHYTYPE_N:
-		if (radio_ver != 0x2055)
+		if (radio_ver != 0x2055 && radio_ver != 0x2056)
 			unsupported = 1;
 		break;
 	default: