aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-10-31 23:27:27 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-10-31 23:27:27 +0000
commit7eba6bff1c6fd3f8f59fd551435b068ff38ac560 (patch)
tree38b2410bbfa4287d87a6485fc75253b2612ece50 /target/linux/generic/patches-3.14
parent3324847acc9f5a1e4a9adc5a211584ca91e1b79d (diff)
downloadupstream-7eba6bff1c6fd3f8f59fd551435b068ff38ac560.tar.gz
upstream-7eba6bff1c6fd3f8f59fd551435b068ff38ac560.tar.bz2
upstream-7eba6bff1c6fd3f8f59fd551435b068ff38ac560.zip
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-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14')
-rw-r--r--target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch14
1 files changed, 13 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch b/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch
index 8cc6ba3513..3628193021 100644
--- a/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch
+++ b/target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch
@@ -1,19 +1,31 @@
--- a/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.
config LIB80211_CRYPT_WEP
- tristate
+ tristate "LIB80211_CRYPT_WEP"
++ select LIB80211
config LIB80211_CRYPT_CCMP
- tristate
+ tristate "LIB80211_CRYPT_CCMP"
++ select LIB80211
config LIB80211_CRYPT_TKIP
- tristate
+ tristate "LIB80211_CRYPT_TKIP"
++ select LIB80211
config LIB80211_DEBUG
bool "lib80211 debugging messages"