aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2009-02-12 00:03:40 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-16 01:43:38 -0500
commitd24fff22d8dba13cc21034144f68f213415cb7c8 (patch)
tree9f199f1d122bb58e78c0dcf7078915b89b8660c0 /net/core
parent51f31cabe3ce5345b51e4a4f82138b38c4d5dc91 (diff)
net: pass new SIOCSHWTSTAMP through to device drivers
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index d20c28e839d3..d393fc997cd9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4019,6 +4019,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)
4019 cmd == SIOCSMIIREG || 4019 cmd == SIOCSMIIREG ||
4020 cmd == SIOCBRADDIF || 4020 cmd == SIOCBRADDIF ||
4021 cmd == SIOCBRDELIF || 4021 cmd == SIOCBRDELIF ||
4022 cmd == SIOCSHWTSTAMP ||
4022 cmd == SIOCWANDEV) { 4023 cmd == SIOCWANDEV) {
4023 err = -EOPNOTSUPP; 4024 err = -EOPNOTSUPP;
4024 if (ops->ndo_do_ioctl) { 4025 if (ops->ndo_do_ioctl) {
@@ -4173,6 +4174,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg)
4173 case SIOCBONDCHANGEACTIVE: 4174 case SIOCBONDCHANGEACTIVE:
4174 case SIOCBRADDIF: 4175 case SIOCBRADDIF:
4175 case SIOCBRDELIF: 4176 case SIOCBRDELIF:
4177 case SIOCSHWTSTAMP:
4176 if (!capable(CAP_NET_ADMIN)) 4178 if (!capable(CAP_NET_ADMIN))
4177 return -EPERM; 4179 return -EPERM;
4178 /* fall through */ 4180 /* fall through */