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/ipv4 | |
| parent | [NETROM]: Remove unessecary lock_sock calls in netrom_ioctl() (diff) | |
| download | linux-dev-b5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723.tar.xz linux-dev-b5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723.zip | |
[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/ipv4')
| -rw-r--r-- | net/ipv4/af_inet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 36a6306ca5a3..966a071a408c 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -777,10 +777,10 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) err = devinet_ioctl(cmd, (void __user *)arg); break; default: - if (!sk->sk_prot->ioctl || - (err = sk->sk_prot->ioctl(sk, cmd, arg)) == - -ENOIOCTLCMD) - err = dev_ioctl(cmd, (void __user *)arg); + if (sk->sk_prot->ioctl) + err = sk->sk_prot->ioctl(sk, cmd, arg); + else + err = -ENOIOCTLCMD; break; } return err; |