diff options
author | Michael Buesch <mb@bu3sch.de> | 2008-01-04 11:06:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:09:20 -0500 |
commit | d5c71e464170e823b5ae5fe7b3555f3c31694148 (patch) | |
tree | 8639278d870519357d0bd800397a1afaa83a63fa /drivers/net/wireless/b43/main.c | |
parent | ca08a965a6c251f9c9002c1a7a0316e63d4c28ec (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
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[] = { | |||
81 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 7), | 81 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 7), |
82 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 9), | 82 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 9), |
83 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10), | 83 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10), |
84 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 11), | ||
84 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13), | 85 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13), |
85 | SSB_DEVTABLE_END | 86 | SSB_DEVTABLE_END |
86 | }; | 87 | }; |
@@ -3053,6 +3054,12 @@ static int b43_phy_versioning(struct b43_wldev *dev) | |||
3053 | if (phy_rev > 9) | 3054 | if (phy_rev > 9) |
3054 | unsupported = 1; | 3055 | unsupported = 1; |
3055 | break; | 3056 | break; |
3057 | #ifdef CONFIG_B43_NPHY | ||
3058 | case B43_PHYTYPE_N: | ||
3059 | if (phy_rev > 1) | ||
3060 | unsupported = 1; | ||
3061 | break; | ||
3062 | #endif | ||
3056 | default: | 3063 | default: |
3057 | unsupported = 1; | 3064 | unsupported = 1; |
3058 | }; | 3065 | }; |