diff options
| author | Alexander Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2004-06-03 07:43:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-03 07:43:50 -0700 |
| commit | f9280acd18138f1e1e2e04d49cc9b615dd492e2e (patch) | |
| tree | 2e8f43006a2f271c577297362100ba135a50e7af /net/socket.c | |
| parent | eb3119f9c6cac802e0f80694126495b1bb46e357 (diff) | |
[PATCH] sparse: vlan annotation
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index a293bf13e095..b10023d9eefd 100644 --- a/net/socket.c +++ b/net/socket.c @@ -740,9 +740,9 @@ void brioctl_set(int (*hook)(unsigned int, void __user *)) EXPORT_SYMBOL(brioctl_set); static DECLARE_MUTEX(vlan_ioctl_mutex); -static int (*vlan_ioctl_hook)(unsigned long arg); +static int (*vlan_ioctl_hook)(void __user *arg); -void vlan_ioctl_set(int (*hook)(unsigned long)) +void vlan_ioctl_set(int (*hook)(void __user *)) { down(&vlan_ioctl_mutex); vlan_ioctl_hook = hook; @@ -816,7 +816,7 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd, down(&vlan_ioctl_mutex); if (vlan_ioctl_hook) - err = vlan_ioctl_hook(arg); + err = vlan_ioctl_hook(argp); up(&vlan_ioctl_mutex); break; case SIOCGIFDIVERT: |