aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/Kconfig
diff options
context:
space:
mode:
authorSean MacLennan <seanm@seanm.ca>2011-12-19 23:23:08 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-22 13:48:59 -0800
commit3b148be0df8e45a0259d7e84001cf02e897af614 (patch)
treecfd94e59751c9f102590b1dd348b488f60708366 /drivers/staging/rtl8192e/Kconfig
parentstaging/rtl8192e: Convert to lib80211_crypt_info (diff)
downloadlinux-dev-3b148be0df8e45a0259d7e84001cf02e897af614.tar.xz
linux-dev-3b148be0df8e45a0259d7e84001cf02e897af614.zip
staging/rtl8192e: Register against lib80211
Convert rtllib from registering the crypt drivers against rtllib_crypt and instead register the against lib80211. The crypto functions have R- prepended (R-CCMP, R-TKIP, R-WEP) so they will not clash with the lib80211 versions. We cannot use the lib80211 crypt drivers since the rtl8192e has some hardware support that is not handled by the lib80211 crypt drivers. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/Kconfig')
-rw-r--r--drivers/staging/rtl8192e/Kconfig13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig
index 878f384c0aab..f87e21101857 100644
--- a/drivers/staging/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/Kconfig
@@ -2,7 +2,7 @@ config RTLLIB
tristate "Support for rtllib wireless devices"
depends on WLAN && m
default n
- select RTLLIB_CRYPTO
+ select LIB80211
---help---
If you have a wireless card that uses rtllib, say
Y. Currently the only card is the rtl8192e.
@@ -11,14 +11,9 @@ config RTLLIB
if RTLLIB
-config RTLLIB_CRYPTO
- tristate "Support for rtllib crypto support"
- ---help---
- Base crypto driver for rtllib.
-
config RTLLIB_CRYPTO_CCMP
tristate "Support for rtllib CCMP crypto"
- depends on RTLLIB_CRYPTO
+ depends on RTLLIB
default y
---help---
CCMP crypto driver for rtllib.
@@ -27,7 +22,7 @@ config RTLLIB_CRYPTO_CCMP
config RTLLIB_CRYPTO_TKIP
tristate "Support for rtllib TKIP crypto"
- depends on RTLLIB_CRYPTO
+ depends on RTLLIB
default y
---help---
TKIP crypto driver for rtllib.
@@ -36,7 +31,7 @@ config RTLLIB_CRYPTO_TKIP
config RTLLIB_CRYPTO_WEP
tristate "Support for rtllib WEP crypto"
- depends on RTLLIB_CRYPTO
+ depends on RTLLIB
default y
---help---
TKIP crypto driver for rtllib.