b43: detect N PHY revision/radio
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 24 Dec 2008 14:26:40 +0000 (15:26 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jan 2009 20:59:38 +0000 (15:59 -0500)
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>
drivers/net/wireless/b43/main.c

index a2b1e375f83c19d2d37019b47619da4632a6db08..26e733a5a56e8d067968a9ab2c31d273aa1b4bc5 100644 (file)
@@ -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: