diff options
| author | Alexander Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2004-06-03 10:38:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-03 10:38:48 -0700 |
| commit | 73a660203f2d0625e1cec41d3d4caf23ecf3be7e (patch) | |
| tree | add2382bf505125731478be03af48e60af2ea066 /net/socket.c | |
| parent | 9e1b30a366b9dd66b4ff0ce56b243778bc0dddee (diff) | |
[PATCH] sparse: rest of net/* annotations (in this patchset, that is ;-)
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket.c b/net/socket.c index d3ec3873277a..1aa2ce2a3139 100644 --- a/net/socket.c +++ b/net/socket.c @@ -776,24 +776,24 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unlock_kernel(); sock = SOCKET_I(inode); if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) { - err = dev_ioctl(cmd, (void __user *)arg); + err = dev_ioctl(cmd, argp); } else #ifdef WIRELESS_EXT if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) { - err = dev_ioctl(cmd, (void __user *)arg); + err = dev_ioctl(cmd, argp); } else #endif /* WIRELESS_EXT */ switch (cmd) { case FIOSETOWN: case SIOCSPGRP: err = -EFAULT; - if (get_user(pid, (int __user *)arg)) + if (get_user(pid, (int __user *)argp)) break; err = f_setown(sock->file, pid, 1); break; case FIOGETOWN: case SIOCGPGRP: - err = put_user(sock->file->f_owner.pid, (int __user *)arg); + err = put_user(sock->file->f_owner.pid, (int __user *)argp); break; case SIOCGIFBR: case SIOCSIFBR: @@ -822,7 +822,7 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd, case SIOCGIFDIVERT: case SIOCSIFDIVERT: /* Convert this to call through a hook */ - err = divert_ioctl(cmd, (struct divert_cf *)arg); + err = divert_ioctl(cmd, argp); break; case SIOCADDDLCI: case SIOCDELDLCI: |