mac80211: atomically check whether STA exists already

[linux-2.6] / net / ieee80211 / Kconfig

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index f7e84e9..bd50104 100644 (file)
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -1,8 +1,9 @@
 config IEEE80211
-       tristate "Generic IEEE 802.11 Networking Stack"
+       tristate "Generic IEEE 802.11 Networking Stack (DEPRECATED)"
        ---help---
        This option enables the hardware independent IEEE 802.11
-       networking stack.
+       networking stack.  This component is deprecated in favor of the
+       mac80211 component.
 
 config IEEE80211_DEBUG
        bool "Enable full debugging output"
@@ -32,12 +33,13 @@ config IEEE80211_CRYPT_WEP
        depends on IEEE80211
        select CRYPTO
        select CRYPTO_ARC4
+       select CRYPTO_ECB
        select CRC32
        ---help---
        Include software based cipher suites in support of IEEE
        802.11's WEP.  This is needed for WEP as well as 802.1x.
 
-       This can be compiled as a modules and it will be called
+       This can be compiled as a module and it will be called
        "ieee80211_crypt_wep".
 
 config IEEE80211_CRYPT_CCMP
@@ -50,21 +52,23 @@ config IEEE80211_CRYPT_CCMP
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with CCMP enabled
        networks.
 
-       This can be compiled as a modules and it will be called
+       This can be compiled as a module and it will be called
        "ieee80211_crypt_ccmp".
 
 config IEEE80211_CRYPT_TKIP
        tristate "IEEE 802.11i TKIP encryption"
-       depends on IEEE80211 && NET_RADIO
+       depends on IEEE80211
+       select WIRELESS_EXT
        select CRYPTO
        select CRYPTO_MICHAEL_MIC
+       select CRYPTO_ECB
        select CRC32
        ---help---
        Include software based cipher suites in support of IEEE 802.11i
        (aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
        networks.
 
-       This can be compiled as a modules and it will be called
+       This can be compiled as a module and it will be called
        "ieee80211_crypt_tkip".
 
 source "net/ieee80211/softmac/Kconfig"