2 files changed, 13 insertions, 1 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 0258e3d06280..dec901554ef7 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -440,6 +440,19 @@ Who:	Hans Verkuil <hans.verkuil@cisco.com>
 
 ----------------------------
 
+What:   CONFIG_CFG80211_WEXT
+When:   as soon as distributions ship new wireless tools, ie. wpa_supplicant 1.0
+        and NetworkManager/connman/etc. that are able to use nl80211
+Why:    Wireless extensions are deprecated, and userland tools are moving to
+        using nl80211. New drivers are no longer using wireless extensions,
+        and while there might still be old drivers, both new drivers and new
+        userland no longer needs them and they can't be used for an feature
+        developed in the past couple of years. As such, compatibility with
+        wireless extensions in new drivers will be removed.
+Who:    Johannes Berg <johannes@sipsolutions.net>
+
+----------------------------
+
 What:   g_file_storage driver
 When:   3.8
 Why:    This driver has been superseded by g_mass_storage.
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 8dba3c60794a..4d2b1ec6516f 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -114,7 +114,6 @@ config CFG80211_WEXT
         bool "cfg80211 wireless extensions compatibility"
         depends on CFG80211
         select WEXT_CORE
-        default y
         help
           Enable this option if you need old userspace for wireless
           extensions with cfg80211-based drivers.