mac80211: configuration: Better handling of LIB80211 configuration

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 255-lib80211_kconfig_hacks.patch

diff --git a/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch b/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch
index 8cc6ba351333ec2ac95382d993e8a8f857280657..362819302129dd8aac69dcff6f71dfde418b5f42 100644 (file)
--- a/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch
+++ b/target/linux/generic/patches-3.10/255-lib80211_kconfig_hacks.patch
@@ -1,19 +1,31 @@
 --- a/net/wireless/Kconfig
 +++ b/net/wireless/Kconfig
 --- 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"
          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"
  
  config LIB80211_CRYPT_CCMP
 -      tristate
 +      tristate "LIB80211_CRYPT_CCMP"

++      select LIB80211

  
  config LIB80211_CRYPT_TKIP
 -      tristate
 +      tristate "LIB80211_CRYPT_TKIP"
  
  config LIB80211_CRYPT_TKIP
 -      tristate
 +      tristate "LIB80211_CRYPT_TKIP"

++      select LIB80211

  
  config LIB80211_DEBUG
        bool "lib80211 debugging messages"
  
  config LIB80211_DEBUG
        bool "lib80211 debugging messages"