diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 11:55:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 11:55:54 -0400 |
| commit | e4b42be77ecc663550b515fcb7761b01fac0f272 (patch) | |
| tree | 5bc22f300b79324ae995e1cf24e33607db85675c /fs | |
| parent | 4aee491cd4e4f1069bfbab309cbd653313938d80 (diff) | |
| parent | 2aee6198652b32e5eaef29a8f8330a9dd15b8efd (diff) | |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 5a5b7116cefb..37310b0e8107 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -3190,6 +3190,8 @@ COMPATIBLE_IOCTL(SIOCSIWRETRY) | |||
| 3190 | COMPATIBLE_IOCTL(SIOCGIWRETRY) | 3190 | COMPATIBLE_IOCTL(SIOCGIWRETRY) |
| 3191 | COMPATIBLE_IOCTL(SIOCSIWPOWER) | 3191 | COMPATIBLE_IOCTL(SIOCSIWPOWER) |
| 3192 | COMPATIBLE_IOCTL(SIOCGIWPOWER) | 3192 | COMPATIBLE_IOCTL(SIOCGIWPOWER) |
| 3193 | COMPATIBLE_IOCTL(SIOCSIWAUTH) | ||
| 3194 | COMPATIBLE_IOCTL(SIOCGIWAUTH) | ||
| 3193 | /* hiddev */ | 3195 | /* hiddev */ |
| 3194 | COMPATIBLE_IOCTL(HIDIOCGVERSION) | 3196 | COMPATIBLE_IOCTL(HIDIOCGVERSION) |
| 3195 | COMPATIBLE_IOCTL(HIDIOCAPPLICATION) | 3197 | COMPATIBLE_IOCTL(HIDIOCAPPLICATION) |