summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStefan Sørensen <stefan.sorensen@spectralink.com>2014-06-27 11:59:11 +0200
committerDavid S. Miller <davem@davemloft.net>2014-07-08 01:57:26 +0200
commita6111d3c93d05bfaf3fbf70ed2a0b84cb0d65406 (patch)
tree93afe696badc503ec41b18a82fb5a54c100e2ff9 /net
parentptp: Classify ptp over ip over vlan packets (diff)
downloadlinux-a6111d3c93d05bfaf3fbf70ed2a0b84cb0d65406.tar.xz
linux-a6111d3c93d05bfaf3fbf70ed2a0b84cb0d65406.zip
vlan: Pass SIOC[SG]HWTSTAMP ioctls to real device
This allows applications to enable hardware timestamping without being aware of it being a vlan device and figuring out the real device. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/8021q/vlan_dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index ad2ac3c00398..9d0223b16b46 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -385,6 +385,8 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case SIOCGMIIPHY:
case SIOCGMIIREG:
case SIOCSMIIREG:
+ case SIOCSHWTSTAMP:
+ case SIOCGHWTSTAMP:
if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
break;