summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-01-21 00:46:55 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-01-30 20:35:30 -0500
commitd86b5e0e6bf5980d3136ab4a855522143f2dcb5d (patch)
tree8b63a48c3c063a5cdebeef29f05e698c7143bdf7 /net/socket.c
parent747af1e154545566d04f647f86fc3ae512439fab (diff)
downloadlinux-d86b5e0e6bf5980d3136ab4a855522143f2dcb5d.tar.bz2
[PATCH] net/: fix the WIRELESS_EXT abuse
This patch contains the following changes: - add a CONFIG_WIRELESS_EXT select'ed by NET_RADIO for conditional code - remove the now no longer required #ifdef CONFIG_NET_RADIO from some #include's Based on a patch by Jean Tourrilhes <jt@hpl.hp.com>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c
index b38a263853c3..8aa5f1188e9b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -84,10 +84,7 @@
#include <linux/compat.h>
#include <linux/kmod.h>
#include <linux/audit.h>
-
-#ifdef CONFIG_NET_RADIO
-#include <linux/wireless.h> /* Note : will define WIRELESS_EXT */
-#endif /* CONFIG_NET_RADIO */
+#include <linux/wireless.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
@@ -840,11 +837,11 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
err = dev_ioctl(cmd, argp);
} else
-#ifdef WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT
if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
err = dev_ioctl(cmd, argp);
} else
-#endif /* WIRELESS_EXT */
+#endif /* CONFIG_WIRELESS_EXT */
switch (cmd) {
case FIOSETOWN:
case SIOCSPGRP: