summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-26 08:55:54 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-26 08:55:54 -0700
commite4b42be77ecc663550b515fcb7761b01fac0f272 (patch)
tree5bc22f300b79324ae995e1cf24e33607db85675c /fs
parent4aee491cd4e4f1069bfbab309cbd653313938d80 (diff)
parent2aee6198652b32e5eaef29a8f8330a9dd15b8efd (diff)
downloadlinux-3.10-e4b42be77ecc663550b515fcb7761b01fac0f272.tar.gz
linux-3.10-e4b42be77ecc663550b515fcb7761b01fac0f272.tar.bz2
linux-3.10-e4b42be77ecc663550b515fcb7761b01fac0f272.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] WE : Add missing auth compat-ioctl [PATCH] softmac: Fix inability to associate with WEP networks
Diffstat (limited to 'fs')
-rw-r--r--fs/compat_ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 5a5b7116cef..37310b0e810 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -3190,6 +3190,8 @@ COMPATIBLE_IOCTL(SIOCSIWRETRY)
COMPATIBLE_IOCTL(SIOCGIWRETRY)
COMPATIBLE_IOCTL(SIOCSIWPOWER)
COMPATIBLE_IOCTL(SIOCGIWPOWER)
+COMPATIBLE_IOCTL(SIOCSIWAUTH)
+COMPATIBLE_IOCTL(SIOCGIWAUTH)
/* hiddev */
COMPATIBLE_IOCTL(HIDIOCGVERSION)
COMPATIBLE_IOCTL(HIDIOCAPPLICATION)