diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-09 23:40:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-09 23:40:09 +0200 |
| commit | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (patch) | |
| tree | e5e6cc8637a44354997624f26d4d55834c9915b4 /net/socket.c | |
| parent | ixgbe: Fix KR to KX fail over for Mezzanine cards (diff) | |
| parent | wireless: make wireless drivers select core (diff) | |
| download | linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.tar.xz linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index d53ad11558c3..954f3381cc8a 100644 --- a/net/socket.c +++ b/net/socket.c @@ -905,11 +905,11 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) { err = dev_ioctl(net, cmd, argp); } else -#ifdef CONFIG_WIRELESS_EXT +#ifdef CONFIG_WEXT_CORE if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) { err = dev_ioctl(net, cmd, argp); } else -#endif /* CONFIG_WIRELESS_EXT */ +#endif switch (cmd) { case FIOSETOWN: case SIOCSPGRP: |