tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

b43: rename config option for N-PHY, drop BROKEN

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

authored by

Rafał Miłecki and committed by
John W. Linville 692d2c0f 82a52043

+14 -13
+7 -6
drivers/net/wireless/b43/Kconfig
··· 86 86 select SSB_BLOCKIO 87 87 default y 88 88 89 - config B43_NPHY 90 - bool "Pre IEEE 802.11n support (BROKEN)" 91 - depends on B43 && EXPERIMENTAL && BROKEN 89 + config B43_PHY_N 90 + bool "Support for 802.11n (N-PHY) devices (EXPERIMENTAL)" 91 + depends on B43 && EXPERIMENTAL 92 92 ---help--- 93 - Support for the IEEE 802.11n draft. 93 + Support for the N-PHY. 94 94 95 - THIS IS BROKEN AND DOES NOT WORK YET. 95 + This enables support for devices with N-PHY revision up to 2. 96 96 97 - SAY N. 97 + Say N if you expect high stability and performance. Saying Y will not 98 + affect other devices support and may provide support for basic needs. 98 99 99 100 config B43_PHY_LP 100 101 bool "Support for low-power (LP-PHY) devices (EXPERIMENTAL)"
+4 -4
drivers/net/wireless/b43/Makefile
··· 1 1 b43-y += main.o 2 2 b43-y += tables.o 3 - b43-$(CONFIG_B43_NPHY) += tables_nphy.o 4 - b43-$(CONFIG_B43_NPHY) += radio_2055.o 5 - b43-$(CONFIG_B43_NPHY) += radio_2056.o 3 + b43-$(CONFIG_B43_PHY_N) += tables_nphy.o 4 + b43-$(CONFIG_B43_PHY_N) += radio_2055.o 5 + b43-$(CONFIG_B43_PHY_N) += radio_2056.o 6 6 b43-y += phy_common.o 7 7 b43-y += phy_g.o 8 8 b43-y += phy_a.o 9 - b43-$(CONFIG_B43_NPHY) += phy_n.o 9 + b43-$(CONFIG_B43_PHY_N) += phy_n.o 10 10 b43-$(CONFIG_B43_PHY_LP) += phy_lp.o 11 11 b43-$(CONFIG_B43_PHY_LP) += tables_lpphy.o 12 12 b43-y += sysfs.o
+2 -2
drivers/net/wireless/b43/main.c
··· 4052 4052 if (phy_rev > 9) 4053 4053 unsupported = 1; 4054 4054 break; 4055 - #ifdef CONFIG_B43_NPHY 4055 + #ifdef CONFIG_B43_PHY_N 4056 4056 case B43_PHYTYPE_N: 4057 4057 if (phy_rev > 2) 4058 4058 unsupported = 1; ··· 5097 5097 #ifdef CONFIG_B43_PCMCIA 5098 5098 feat_pcmcia = "M"; 5099 5099 #endif 5100 - #ifdef CONFIG_B43_NPHY 5100 + #ifdef CONFIG_B43_PHY_N 5101 5101 feat_nphy = "N"; 5102 5102 #endif 5103 5103 #ifdef CONFIG_B43_LEDS
+1 -1
drivers/net/wireless/b43/phy_common.c
··· 50 50 phy->ops = &b43_phyops_g; 51 51 break; 52 52 case B43_PHYTYPE_N: 53 - #ifdef CONFIG_B43_NPHY 53 + #ifdef CONFIG_B43_PHY_N 54 54 phy->ops = &b43_phyops_n; 55 55 #endif 56 56 break;