[WEXT]: Clean up how wext is called.

This patch cleans up the call paths from the core code into wext.

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

1 files changed, 4 insertions, 30 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 700e4b5081b6..d5e42d13bd67 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -109,7 +109,7 @@
 #include <linux/netpoll.h>
 #include <linux/rcupdate.h>
 #include <linux/delay.h>
-#include <linux/wireless.h>
+#include <net/wext.h>
 #include <net/iw_handler.h>
 #include <asm/current.h>
 #include <linux/audit.h>
@@ -2348,12 +2348,6 @@ static const struct file_operations ptype_seq_fops = {
 };
 
 
-#ifdef CONFIG_WIRELESS_EXT
-extern int wireless_proc_init(void);
-#else
-#define wireless_proc_init() 0
-#endif
-
 static int __init dev_proc_init(void)
 {
         int rc = -ENOMEM;
@@ -2365,7 +2359,7 @@ static int __init dev_proc_init(void)
         if (!proc_net_fops_create("ptype", S_IRUGO, &ptype_seq_fops))
                 goto out_dev2;
 
-        if (wireless_proc_init())
+        if (wext_proc_init())
                 goto out_softnet;
         rc = 0;
 out:
@@ -2923,29 +2917,9 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
                                         ret = -EFAULT;
                                 return ret;
                         }
-#ifdef CONFIG_WIRELESS_EXT
                         /* Take care of Wireless Extensions */
-                        if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
-                                /* If command is `set a parameter', or
-                                 * `get the encoding parameters', check if
-                                 * the user has the right to do it */
-                                if (IW_IS_SET(cmd) || cmd == SIOCGIWENCODE
-                                    || cmd == SIOCGIWENCODEEXT) {
-                                        if (!capable(CAP_NET_ADMIN))
-                                                return -EPERM;
-                                }
-                                dev_load(ifr.ifr_name);
-                                rtnl_lock();
-                                /* Follow me in net/wireless/wext.c */
-                                ret = wireless_process_ioctl(&ifr, cmd);
-                                rtnl_unlock();
-                                if (IW_IS_GET(cmd) &&
-                                    copy_to_user(arg, &ifr,
-                                                 sizeof(struct ifreq)))
-                                        ret = -EFAULT;
-                                return ret;
-                        }
-#endif  /* CONFIG_WIRELESS_EXT */
+                        if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST)
+                                return wext_handle_ioctl(&ifr, cmd, arg);
                         return -EINVAL;
         }
 }