b43: LP-PHY: Remove BROKEN from B43_PHY_LP

Larry has reported success getting scan data with an LP-PHY device,
so it's probably time to release LP-PHY support for testing.

Also disable 802.11a support for now, as 802.11a currently causes
the driver to panic on startup (NULL pointer dereference).

Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 67f564e372250add1492af4149ebade112e60519..237b1aadf9b6d08ee9c85f47e6c5080638a98492 100644 (file)
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -80,16 +80,16 @@ config B43_NPHY
          SAY N.
 
 config B43_PHY_LP
-       bool "IEEE 802.11g LP-PHY support (BROKEN)"
-       depends on B43 && EXPERIMENTAL && BROKEN
+       bool "Support for low-power (LP-PHY) devices (EXPERIMENTAL)"
+       depends on B43 && EXPERIMENTAL
        ---help---
          Support for the LP-PHY.
-         The LP-PHY is an IEEE 802.11g based PHY built into some notebooks
-         and embedded devices.
-
-         THIS IS BROKEN AND DOES NOT WORK YET.
+         The LP-PHY is a low-power PHY built into some notebooks
+         and embedded devices. It supports 802.11a/g
+         (802.11a support is optional, and currently disabled).
 
-         SAY N.
+         This is heavily experimental, and probably will not work for you.
+         Say N unless you want to help debug the driver.
 
 # This config option automatically enables b43 LEDS support,
 # if it's possible.

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 99b41ce6848bc9abe58e9eadd8c809fcf889c891..c5bece0904203470afce2fd444b3872fe7e67c23 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4514,7 +4514,9 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
                        have_5ghz_phy = 1;
                        break;
                case B43_PHYTYPE_LP: //FIXME not always!
+#if 0 //FIXME enabling 5GHz causes a NULL pointer dereference
                        have_5ghz_phy = 1;
+#endif
                case B43_PHYTYPE_G:
                case B43_PHYTYPE_N:
                        have_2ghz_phy = 1;