diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-06 00:45:14 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-06 00:45:14 (GMT) |
| commit | 426e1fa31e0d8e982891e801c80b84b74f209f10 (patch) | |
| tree | bc53409418ffa918fb3f175639bc5c9245c4219f /net/core | |
| parent | e1ca87bb1b64b044163e686ff3bb71405156c561 (diff) | |
| parent | a4bcc795e9cc84902b86edbfbb755ecb38d11f91 (diff) | |
| download | linux-426e1fa31e0d8e982891e801c80b84b74f209f10.tar.xz | |
Merge branch 'siocghwtstamp' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
SIOCGHWTSTAMP ioctl
1. Add the SIOCGHWTSTAMP ioctl and update the timestamping
documentation.
2. Implement SIOCGHWTSTAMP in most drivers that support SIOCSHWTSTAMP.
3. Add a test program to exercise SIOC{G,S}HWTSTAMP.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev_ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index 5b7d0e1..cf999e0 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -327,6 +327,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) cmd == SIOCBRADDIF || cmd == SIOCBRDELIF || cmd == SIOCSHWTSTAMP || + cmd == SIOCGHWTSTAMP || cmd == SIOCWANDEV) { err = -EOPNOTSUPP; if (ops->ndo_do_ioctl) { @@ -546,6 +547,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg) */ default: if (cmd == SIOCWANDEV || + cmd == SIOCGHWTSTAMP || (cmd >= SIOCDEVPRIVATE && cmd <= SIOCDEVPRIVATE + 15)) { dev_load(net, ifr.ifr_name); |