Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / net / wireless / Kconfig

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 29c8675f9a1189db65c185f2ad04f96a67702989..4f5543dd25243e0c959dacb00327155cd4e27e2b 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -175,13 +175,21 @@ config CFG80211_INTERNAL_REGDB
          Most distributions have a CRDA package.  So if unsure, say N.
 
 config CFG80211_WEXT
-       bool "cfg80211 wireless extensions compatibility"
+       bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT
        depends on CFG80211
        select WEXT_CORE
+       default y if CFG80211_WEXT_EXPORT
        help
          Enable this option if you need old userspace for wireless
          extensions with cfg80211-based drivers.
 
+config CFG80211_WEXT_EXPORT
+       bool
+       depends on CFG80211
+       help
+         Drivers should select this option if they require cfg80211's
+         wext compatibility symbols to be exported.
+
 config LIB80211
        tristate
        default n