diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-01-03 23:18:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-03 23:18:33 +0100 |
| commit | b5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723 (patch) | |
| tree | 7a87804b0953f22de43054ccc7ae67ebc5b66b20 /net/appletalk | |
| parent | [NETROM]: Remove unessecary lock_sock calls in netrom_ioctl() (diff) | |
| download | linux-b5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723.tar.xz linux-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/appletalk')
| -rw-r--r-- | net/appletalk/ddp.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 296f186802ff..a5144e43aae1 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1763,7 +1763,7 @@ static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr */ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { - int rc = -EINVAL; + int rc = -ENOIOCTLCMD; struct sock *sk = sock->sk; void __user *argp = (void __user *)arg; @@ -1813,23 +1813,6 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) rc = atif_ioctl(cmd, argp); rtnl_unlock(); break; - /* Physical layer ioctl calls */ - case SIOCSIFLINK: - case SIOCGIFHWADDR: - case SIOCSIFHWADDR: - case SIOCGIFFLAGS: - case SIOCSIFFLAGS: - case SIOCGIFTXQLEN: - case SIOCSIFTXQLEN: - case SIOCGIFMTU: - case SIOCGIFCONF: - case SIOCADDMULTI: - case SIOCDELMULTI: - case SIOCGIFCOUNT: - case SIOCGIFINDEX: - case SIOCGIFNAME: - rc = dev_ioctl(cmd, argp); - break; } return rc; |