diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-31 23:27:27 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-31 23:27:27 +0000 |
| commit | 7eba6bff1c6fd3f8f59fd551435b068ff38ac560 (patch) | |
| tree | 38b2410bbfa4287d87a6485fc75253b2612ece50 | |
| parent | 3324847acc9f5a1e4a9adc5a211584ca91e1b79d (diff) | |
| download | master-187ad058-7eba6bff1c6fd3f8f59fd551435b068ff38ac560.tar.gz master-187ad058-7eba6bff1c6fd3f8f59fd551435b068ff38ac560.tar.bz2 master-187ad058-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
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" |