cfg80211: self-contained wext handling where possible

Finally! This is what you've all been waiting for!

This patch makes cfg80211 take care of wext emulation
_completely_ by itself, drivers that don't need things
cfg80211 doesn't do yet don't even need to be aware of
wireless extensions.
This means we can also clean up mac80211's and iwm's
Kconfig and make it possible to build them w/o wext
now!

		RIP wext.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

6 files changed, 0 insertions, 106 deletions

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 19a4c66e143e..7dd77b6d4c9a 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -6,7 +6,6 @@ config MAC80211
         select CRYPTO_ARC4
         select CRYPTO_AES
         select CRC32
-        select WIRELESS_EXT
         ---help---
           This option enables the hardware independent IEEE 802.11
           networking stack.
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 91284a74ff91..9f3cf7129324 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_MAC80211) += mac80211.o
 # mac80211 objects
 mac80211-y := \
         main.o \
-        wext.o \
         sta_info.o \
         wep.o \
         wpa.o \
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index c6b25cb73284..aec6853cb435 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -24,7 +24,6 @@
 #include <linux/spinlock.h>
 #include <linux/etherdevice.h>
 #include <net/cfg80211.h>
-#include <net/iw_handler.h>
 #include <net/mac80211.h>
 #include "key.h"
 #include "sta_info.h"
@@ -951,9 +950,6 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
 void ieee80211_configure_filter(struct ieee80211_local *local);
 u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata);
 
-/* wireless extensions */
-extern const struct iw_handler_def ieee80211_iw_handler_def;
-
 /* STA code */
 void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata);
 int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index d79a21105042..6c655b6547fb 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -684,7 +684,6 @@ static void ieee80211_if_setup(struct net_device *dev)
 {
         ether_setup(dev);
         dev->netdev_ops = &ieee80211_dataif_ops;
-        dev->wireless_handlers = &ieee80211_iw_handler_def;
         dev->destructor = free_netdev;
 }
 
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 147772a2977c..45731000eb8d 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -18,7 +18,6 @@
 #include <linux/if_arp.h>
 #include <linux/rtnetlink.h>
 #include <net/mac80211.h>
-#include <net/iw_handler.h>
 
 #include "ieee80211_i.h"
 #include "driver-ops.h"
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
deleted file mode 100644
index aa250c3e8fda..000000000000
--- a/net/mac80211/wext.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2002-2005, Instant802 Networks, Inc.
- * Copyright 2005-2006, Devicescape Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/skbuff.h>
-#include <linux/etherdevice.h>
-#include <linux/if_arp.h>
-#include <linux/wireless.h>
-#include <net/iw_handler.h>
-#include <asm/uaccess.h>
-
-#include <net/mac80211.h>
-#include "ieee80211_i.h"
-#include "led.h"
-#include "rate.h"
-#include "wpa.h"
-#include "aes_ccm.h"
-
-
-
-/* Structures to export the Wireless Handlers */
-
-static const iw_handler ieee80211_handler[] =
-{
-        (iw_handler) NULL,                              /* SIOCSIWCOMMIT */
-        (iw_handler) cfg80211_wext_giwname,             /* SIOCGIWNAME */
-        (iw_handler) NULL,                              /* SIOCSIWNWID */
-        (iw_handler) NULL,                              /* SIOCGIWNWID */
-        (iw_handler) cfg80211_wext_siwfreq,             /* SIOCSIWFREQ */
-        (iw_handler) cfg80211_wext_giwfreq,             /* SIOCGIWFREQ */
-        (iw_handler) cfg80211_wext_siwmode,             /* SIOCSIWMODE */
-        (iw_handler) cfg80211_wext_giwmode,             /* SIOCGIWMODE */
-        (iw_handler) NULL,                              /* SIOCSIWSENS */
-        (iw_handler) NULL,                              /* SIOCGIWSENS */
-        (iw_handler) NULL /* not used */,               /* SIOCSIWRANGE */
-        (iw_handler) cfg80211_wext_giwrange,            /* SIOCGIWRANGE */
-        (iw_handler) NULL /* not used */,               /* SIOCSIWPRIV */
-        (iw_handler) NULL /* kernel code */,            /* SIOCGIWPRIV */
-        (iw_handler) NULL /* not used */,               /* SIOCSIWSTATS */
-        (iw_handler) NULL /* kernel code */,            /* SIOCGIWSTATS */
-        (iw_handler) NULL,                              /* SIOCSIWSPY */
-        (iw_handler) NULL,                              /* SIOCGIWSPY */
-        (iw_handler) NULL,                              /* SIOCSIWTHRSPY */
-        (iw_handler) NULL,                              /* SIOCGIWTHRSPY */
-        (iw_handler) cfg80211_wext_siwap,               /* SIOCSIWAP */
-        (iw_handler) cfg80211_wext_giwap,               /* SIOCGIWAP */
-        (iw_handler) cfg80211_wext_siwmlme,             /* SIOCSIWMLME */
-        (iw_handler) NULL,                              /* SIOCGIWAPLIST */
-        (iw_handler) cfg80211_wext_siwscan,             /* SIOCSIWSCAN */
-        (iw_handler) cfg80211_wext_giwscan,             /* SIOCGIWSCAN */
-        (iw_handler) cfg80211_wext_siwessid,            /* SIOCSIWESSID */
-        (iw_handler) cfg80211_wext_giwessid,            /* SIOCGIWESSID */
-        (iw_handler) NULL,                              /* SIOCSIWNICKN */
-        (iw_handler) NULL,                              /* SIOCGIWNICKN */
-        (iw_handler) NULL,                              /* -- hole -- */
-        (iw_handler) NULL,                              /* -- hole -- */
-        (iw_handler) cfg80211_wext_siwrate,             /* SIOCSIWRATE */
-        (iw_handler) cfg80211_wext_giwrate,             /* SIOCGIWRATE */
-        (iw_handler) cfg80211_wext_siwrts,              /* SIOCSIWRTS */
-        (iw_handler) cfg80211_wext_giwrts,              /* SIOCGIWRTS */
-        (iw_handler) cfg80211_wext_siwfrag,             /* SIOCSIWFRAG */
-        (iw_handler) cfg80211_wext_giwfrag,             /* SIOCGIWFRAG */
-        (iw_handler) cfg80211_wext_siwtxpower,          /* SIOCSIWTXPOW */
-        (iw_handler) cfg80211_wext_giwtxpower,          /* SIOCGIWTXPOW */
-        (iw_handler) cfg80211_wext_siwretry,            /* SIOCSIWRETRY */
-        (iw_handler) cfg80211_wext_giwretry,            /* SIOCGIWRETRY */
-        (iw_handler) cfg80211_wext_siwencode,           /* SIOCSIWENCODE */
-        (iw_handler) cfg80211_wext_giwencode,           /* SIOCGIWENCODE */
-        (iw_handler) cfg80211_wext_siwpower,            /* SIOCSIWPOWER */
-        (iw_handler) cfg80211_wext_giwpower,            /* SIOCGIWPOWER */
-        (iw_handler) NULL,                              /* -- hole -- */
-        (iw_handler) NULL,                              /* -- hole -- */
-        (iw_handler) cfg80211_wext_siwgenie,            /* SIOCSIWGENIE */
-        (iw_handler) NULL,                              /* SIOCGIWGENIE */
-        (iw_handler) cfg80211_wext_siwauth,             /* SIOCSIWAUTH */
-        (iw_handler) cfg80211_wext_giwauth,             /* SIOCGIWAUTH */
-        (iw_handler) cfg80211_wext_siwencodeext,        /* SIOCSIWENCODEEXT */
-        (iw_handler) NULL,                              /* SIOCGIWENCODEEXT */
-        (iw_handler) NULL,                              /* SIOCSIWPMKSA */
-        (iw_handler) NULL,                              /* -- hole -- */
-};
-
-const struct iw_handler_def ieee80211_iw_handler_def =
-{
-        .num_standard   = ARRAY_SIZE(ieee80211_handler),
-        .standard       = (iw_handler *) ieee80211_handler,
-        .get_wireless_stats = cfg80211_wireless_stats,
-};