mac80211: configuration: Better handling of LIB80211 configuration
Apply patch for kernel 3.10 from r43112 also in 3.12, 3.14 and 3.18. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43133 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
3324847acc
commit
7eba6bff1c
|
@ -1,19 +1,31 @@
|
||||||
--- a/net/wireless/Kconfig
|
--- a/net/wireless/Kconfig
|
||||||
+++ b/net/wireless/Kconfig
|
+++ b/net/wireless/Kconfig
|
||||||
@@ -149,13 +149,13 @@ config LIB80211
|
@@ -140,7 +140,7 @@ config CFG80211_WEXT
|
||||||
|
extensions with cfg80211-based drivers.
|
||||||
|
|
||||||
|
config LIB80211
|
||||||
|
- tristate
|
||||||
|
+ tristate "LIB80211"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This options enables a library of common routines used
|
||||||
|
@@ -149,13 +149,16 @@ config LIB80211
|
||||||
Drivers should select this themselves if needed.
|
Drivers should select this themselves if needed.
|
||||||
|
|
||||||
config LIB80211_CRYPT_WEP
|
config LIB80211_CRYPT_WEP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_WEP"
|
+ tristate "LIB80211_CRYPT_WEP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_CRYPT_CCMP
|
config LIB80211_CRYPT_CCMP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_CCMP"
|
+ tristate "LIB80211_CRYPT_CCMP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_CRYPT_TKIP
|
config LIB80211_CRYPT_TKIP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_TKIP"
|
+ tristate "LIB80211_CRYPT_TKIP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_DEBUG
|
config LIB80211_DEBUG
|
||||||
bool "lib80211 debugging messages"
|
bool "lib80211 debugging messages"
|
||||||
|
|
|
@ -1,19 +1,31 @@
|
||||||
--- a/net/wireless/Kconfig
|
--- a/net/wireless/Kconfig
|
||||||
+++ b/net/wireless/Kconfig
|
+++ b/net/wireless/Kconfig
|
||||||
@@ -149,13 +149,13 @@ config LIB80211
|
@@ -140,7 +140,7 @@ config CFG80211_WEXT
|
||||||
|
extensions with cfg80211-based drivers.
|
||||||
|
|
||||||
|
config LIB80211
|
||||||
|
- tristate
|
||||||
|
+ tristate "LIB80211"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This options enables a library of common routines used
|
||||||
|
@@ -149,13 +149,16 @@ config LIB80211
|
||||||
Drivers should select this themselves if needed.
|
Drivers should select this themselves if needed.
|
||||||
|
|
||||||
config LIB80211_CRYPT_WEP
|
config LIB80211_CRYPT_WEP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_WEP"
|
+ tristate "LIB80211_CRYPT_WEP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_CRYPT_CCMP
|
config LIB80211_CRYPT_CCMP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_CCMP"
|
+ tristate "LIB80211_CRYPT_CCMP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_CRYPT_TKIP
|
config LIB80211_CRYPT_TKIP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_TKIP"
|
+ tristate "LIB80211_CRYPT_TKIP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_DEBUG
|
config LIB80211_DEBUG
|
||||||
bool "lib80211 debugging messages"
|
bool "lib80211 debugging messages"
|
||||||
|
|
|
@ -1,19 +1,31 @@
|
||||||
--- a/net/wireless/Kconfig
|
--- a/net/wireless/Kconfig
|
||||||
+++ b/net/wireless/Kconfig
|
+++ b/net/wireless/Kconfig
|
||||||
@@ -192,13 +192,13 @@ config LIB80211
|
@@ -183,7 +183,7 @@ config CFG80211_WEXT
|
||||||
|
extensions with cfg80211-based drivers.
|
||||||
|
|
||||||
|
config LIB80211
|
||||||
|
- tristate
|
||||||
|
+ tristate "LIB80211"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This options enables a library of common routines used
|
||||||
|
@@ -192,13 +192,16 @@ config LIB80211
|
||||||
Drivers should select this themselves if needed.
|
Drivers should select this themselves if needed.
|
||||||
|
|
||||||
config LIB80211_CRYPT_WEP
|
config LIB80211_CRYPT_WEP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_WEP"
|
+ tristate "LIB80211_CRYPT_WEP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_CRYPT_CCMP
|
config LIB80211_CRYPT_CCMP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_CCMP"
|
+ tristate "LIB80211_CRYPT_CCMP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_CRYPT_TKIP
|
config LIB80211_CRYPT_TKIP
|
||||||
- tristate
|
- tristate
|
||||||
+ tristate "LIB80211_CRYPT_TKIP"
|
+ tristate "LIB80211_CRYPT_TKIP"
|
||||||
|
+ select LIB80211
|
||||||
|
|
||||||
config LIB80211_DEBUG
|
config LIB80211_DEBUG
|
||||||
bool "lib80211 debugging messages"
|
bool "lib80211 debugging messages"
|
||||||
|
|
Loading…
Reference in New Issue