aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-31 23:27:27 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-31 23:27:27 +0000
commitb63cfc95302367d4900d68364fcf66c4074ab112 (patch)
treeed80b84b41a4efe84aa671a1f07bb36b74cde842
parent7996f0b3135b1469823a15489d1a86804915ee5c (diff)
downloadupstream-b63cfc95302367d4900d68364fcf66c4074ab112.tar.gz
upstream-b63cfc95302367d4900d68364fcf66c4074ab112.tar.bz2
upstream-b63cfc95302367d4900d68364fcf66c4074ab112.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> SVN-Revision: 43133
-rw-r--r--target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch14
-rw-r--r--target/linux/generic/patches-3.14/255-lib80211_kconfig_hacks.patch14
-rw-r--r--target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch14
3 files changed, 39 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch b/target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch
index 8cc6ba3513..3628193021 100644
--- a/target/linux/generic/patches-3.13/255-lib80211_kconfig_hacks.patch
+++ b/target/linux/generic/patches-3.13/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"
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"
diff --git a/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch b/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch
index 32bb2aaf63..d8752359c7 100644
--- a/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch
+++ b/target/linux/generic/patches-3.18/255-lib80211_kconfig_hacks.patch
@@ -1,19 +1,31 @@
--- a/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.
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"