lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki
2010-12-07 21:56:00 +01:00
committed by John W. Linville
parent 82a52043c7
commit 692d2c0fb3
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/b43/Kconfig
View File

@ -86,15 +86,16 @@ config B43_PIO
select SSB_BLOCKIO select SSB_BLOCKIO
default y default y
config B43_NPHY config B43_PHY_N
bool "Pre IEEE 802.11n support (BROKEN)" bool "Support for 802.11n (N-PHY) devices (EXPERIMENTAL)"
depends on B43 && EXPERIMENTAL && BROKEN depends on B43 && EXPERIMENTAL
---help--- ---help---
Support for the IEEE 802.11n draft. Support for the N-PHY.
THIS IS BROKEN AND DOES NOT WORK YET. This enables support for devices with N-PHY revision up to 2.
SAY N. Say N if you expect high stability and performance. Saying Y will not
affect other devices support and may provide support for basic needs.
config B43_PHY_LP config B43_PHY_LP
bool "Support for low-power (LP-PHY) devices (EXPERIMENTAL)" bool "Support for low-power (LP-PHY) devices (EXPERIMENTAL)"

8
drivers/net/wireless/b43/Makefile
View File

@ -1,12 +1,12 @@
b43-y += main.o b43-y += main.o
b43-y += tables.o b43-y += tables.o
b43-$(CONFIG_B43_NPHY) += tables_nphy.o b43-$(CONFIG_B43_PHY_N) += tables_nphy.o
b43-$(CONFIG_B43_NPHY) += radio_2055.o b43-$(CONFIG_B43_PHY_N) += radio_2055.o
b43-$(CONFIG_B43_NPHY) += radio_2056.o b43-$(CONFIG_B43_PHY_N) += radio_2056.o
b43-y += phy_common.o b43-y += phy_common.o
b43-y += phy_g.o b43-y += phy_g.o
b43-y += phy_a.o b43-y += phy_a.o
b43-$(CONFIG_B43_NPHY) += phy_n.o b43-$(CONFIG_B43_PHY_N) += phy_n.o
b43-$(CONFIG_B43_PHY_LP) += phy_lp.o b43-$(CONFIG_B43_PHY_LP) += phy_lp.o
b43-$(CONFIG_B43_PHY_LP) += tables_lpphy.o b43-$(CONFIG_B43_PHY_LP) += tables_lpphy.o
b43-y += sysfs.o b43-y += sysfs.o

4
drivers/net/wireless/b43/main.c
View File

@ -4052,7 +4052,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
if (phy_rev > 9) if (phy_rev > 9)
unsupported = 1; unsupported = 1;
break; break;
#ifdef CONFIG_B43_NPHY #ifdef CONFIG_B43_PHY_N
case B43_PHYTYPE_N: case B43_PHYTYPE_N:
if (phy_rev > 2) if (phy_rev > 2)
unsupported = 1; unsupported = 1;
@ -5097,7 +5097,7 @@ static void b43_print_driverinfo(void)
#ifdef CONFIG_B43_PCMCIA #ifdef CONFIG_B43_PCMCIA
feat_pcmcia = "M"; feat_pcmcia = "M";
#endif #endif
#ifdef CONFIG_B43_NPHY #ifdef CONFIG_B43_PHY_N
feat_nphy = "N"; feat_nphy = "N";
#endif #endif
#ifdef CONFIG_B43_LEDS #ifdef CONFIG_B43_LEDS

2
drivers/net/wireless/b43/phy_common.c
View File

@ -50,7 +50,7 @@ int b43_phy_allocate(struct b43_wldev *dev)
phy->ops = &b43_phyops_g; phy->ops = &b43_phyops_g;
break; break;
case B43_PHYTYPE_N: case B43_PHYTYPE_N:
#ifdef CONFIG_B43_NPHY #ifdef CONFIG_B43_PHY_N
phy->ops = &b43_phyops_n; phy->ops = &b43_phyops_n;
#endif #endif
break; break;