[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>

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;