diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-04-20 17:36:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 17:36:10 -0400 |
| commit | f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3 (patch) | |
| tree | 9ff4b7efdb2ca1e83c2a413f06268b268098b3ca /net/core/dev.c | |
| parent | [PATCH] NEx000: fix RTL8019AS base address for RBTX4938 (diff) | |
| parent | [PATCH] wext: Fix RtNetlink ENCODE security permissions (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 83231a27ae02..3bad1afc89fa 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2698,7 +2698,8 @@ int dev_ioctl(unsigned int cmd, void __user *arg) /* If command is `set a parameter', or * `get the encoding parameters', check if * the user has the right to do it */ - if (IW_IS_SET(cmd) || cmd == SIOCGIWENCODE) { + if (IW_IS_SET(cmd) || cmd == SIOCGIWENCODE + || cmd == SIOCGIWENCODEEXT) { if (!capable(CAP_NET_ADMIN)) return -EPERM; } |