b43: Add NPHY kconfig option

This adds a new Kconfig option for enabling probing of N-PHYs.
This option will be removed again once the stuff works.
For now it is to help in development. This way real users won't
execute the broken N-PHY codepaths, but the developers can easily
enable N-PHY stuff.

To enable N-PHY probing simply remove the BROKEN dependency
and enable the option in the kernel config.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 17 insertions, 0 deletions

diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 8aa5e3458dcd..1a2141dabdc7 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -61,6 +61,16 @@ config B43_PCMCIA
 
           If unsure, say N.
 
+config B43_NPHY
+        bool "Pre IEEE 802.11n support (BROKEN)"
+        depends on B43 && EXPERIMENTAL && BROKEN
+        ---help---
+          Support for the IEEE 802.11n draft.
+
+          THIS IS BROKEN AND DOES NOT WORK YET.
+
+          SAY N.
+
 # This config option automatically enables b43 LEDS support,
 # if it's possible.
 config B43_LEDS
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 62e4b6371e55..39eaeb5598b5 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -81,6 +81,7 @@ static const struct ssb_device_id b43_ssb_tbl[] = {
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 7),
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 9),
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10),
+        SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 11),
         SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13),
         SSB_DEVTABLE_END
 };
@@ -3053,6 +3054,12 @@ static int b43_phy_versioning(struct b43_wldev *dev)
                 if (phy_rev > 9)
                         unsupported = 1;
                 break;
+#ifdef CONFIG_B43_NPHY
+        case B43_PHYTYPE_N:
+                if (phy_rev > 1)
+                        unsupported = 1;
+                break;
+#endif
         default:
                 unsupported = 1;
         };