aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-01-03 14:18:33 -0800
committerDavid S. Miller <davem@davemloft.net>2006-01-03 14:18:33 -0800
commitb5e5fa5e093e42cab4ee3d6dcbc4f450ad29a723 (patch)
tree7a87804b0953f22de43054ccc7ae67ebc5b66b20 /net/irda
parent[NETROM]: Remove unessecary lock_sock calls in netrom_ioctl() (diff)
downloadlinux-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/irda')
-rw-r--r--net/irda/af_irda.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index e57683d424f7..fbfa96754417 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -1822,7 +1822,7 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return -EINVAL;
default:
IRDA_DEBUG(1, "%s(), doing device ioctl!\n", __FUNCTION__);
- return dev_ioctl(cmd, (void __user *) arg);
+ return -ENOIOCTLCMD;
}
/*NOTREACHED*/