Merge commit 'v3.17' into next

1 files changed, 2 insertions, 0 deletions

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index dd11f612e03e..35a6b6b15e8a 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;