diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:50:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:50:55 -0500 |
| commit | 0b310f36d7d96e27f6941ec0f9b95e15142f1e78 (patch) | |
| tree | c2a3d403c82fd892ded3849cc721cf8e6f8c7824 /net/socket.c | |
| parent | 359b8800d3a46557844969c485e1a14baf119b06 (diff) | |
| parent | 2f633db5e9c57e07a971b65e9a72f090f59fd5f6 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c index b38a263853c..8aa5f1188e9 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: |