5 files changed, 35 insertions, 5 deletions

diff --git a/net/Kconfig b/net/Kconfig
index e2d9b3b9cda4..ae1817dc51b8 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -212,14 +212,17 @@ endmenu
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
-source "net/ieee80211/Kconfig"
-
-config WIRELESS_EXT
-        bool
 
 config FIB_RULES
         bool
 
+menu "Wireless"
+
+source "net/wireless/Kconfig"
+source "net/ieee80211/Kconfig"
+
+endmenu
+
 endif   # if NET
 endmenu # Networking
 
diff --git a/net/Makefile b/net/Makefile
index 4854ac506313..29bbe19d87f1 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -52,3 +52,5 @@ obj-$(CONFIG_IUCV)		+= iucv/
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)            += sysctl_net.o
 endif
+
+obj-y                           += wireless/
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 6ef766ef9618..1438adedbc83 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
         tristate "IEEE 802.11i TKIP encryption"
-        depends on IEEE80211 && NET_RADIO
+        depends on IEEE80211
+        select WIRELESS_EXT
         select CRYPTO
         select CRYPTO_MICHAEL_MIC
         select CRYPTO_ECB
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
new file mode 100644
index 000000000000..ca2f05c29760
--- /dev/null
+++ b/net/wireless/Kconfig
@@ -0,0 +1,23 @@
+config WIRELESS_EXT
+        bool "Wireless extensions"
+        default n
+        ---help---
+          This option enables the legacy wireless extensions
+          (wireless network interface configuration via ioctls.)
+
+          Wireless extensions will be replaced by cfg80211 and
+          will be required only by legacy drivers that implement
+          wireless extension handlers.
+
+          Say N (if you can) unless you know you need wireless
+          extensions for external modules.
+
+config NET_WIRELESS_RTNETLINK
+        bool "Wireless Extension API over RtNetlink"
+        depends on WIRELESS_EXT
+        ---help---
+          Support the Wireless Extension API over the RtNetlink socket
+          in addition to the traditional ioctl interface (selected above).
+
+          For now, few tools use this facility, but it might grow in the
+          future. The only downside is that it adds 4.5 kB to your kernel.
diff --git a/net/wireless/Makefile b/net/wireless/Makefile
new file mode 100644
index 000000000000..cf4e3d9726b8
--- /dev/null
+++ b/net/wireless/Makefile
@@ -0,0 +1 @@
+# dummy file for now