diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-01-03 14:18:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-03 14:18:33 -0800 |
| commit | b5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723 (patch) | |
| tree | 7a87804b0953f22de43054ccc7ae67ebc5b66b20 /net/ipv6 | |
| parent | 5ff7630e4aa6c3969094dc30ff1cdaa6f52b0ed0 (diff) | |
| download | op-kernel-dev-b5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723.zip op-kernel-dev-b5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723.tar.gz | |
[NET]: Add a dev_ioctl() fallback to sock_ioctl()
Currently all network protocols need to call dev_ioctl as the default
fallback in their ioctl implementations. This patch adds a fallback
to dev_ioctl to sock_ioctl if the protocol returned -ENOIOCTLCMD.
This way all the procotol ioctl handlers can be simplified and we don't
need to export dev_ioctl.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/af_inet6.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 7c9f192..68afc53 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -434,7 +434,6 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { struct sock *sk = sock->sk; - int err = -EINVAL; switch(cmd) { @@ -453,10 +452,9 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) case SIOCSIFDSTADDR: return addrconf_set_dstaddr((void __user *) arg); default: - if (!sk->sk_prot->ioctl || - (err = sk->sk_prot->ioctl(sk, cmd, arg)) == -ENOIOCTLCMD) - return(dev_ioctl(cmd,(void __user *) arg)); - return err; + if (!sk->sk_prot->ioctl) + return -ENOIOCTLCMD; + return sk->sk_prot->ioctl(sk, cmd, arg); } /*NOTREACHED*/ return(0); |
