Skip to content

Commit 731b73d

Browse files
Vadim Fedorenkodavem330
authored andcommitted
vlan: partially enable SIOCSHWTSTAMP in container
Setting timestamp filter was explicitly disabled on vlan devices in containers because it might affect other processes on the host. But it's absolutely legit in case when real device is in the same namespace. Fixes: 873017a ("vlan: disable SIOCSHWTSTAMP in container") Signed-off-by: Vadim Fedorenko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e05c518 commit 731b73d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/8021q/vlan_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
365365

366366
switch (cmd) {
367367
case SIOCSHWTSTAMP:
368-
if (!net_eq(dev_net(dev), &init_net))
368+
if (!net_eq(dev_net(dev), dev_net(real_dev)))
369369
break;
370370
fallthrough;
371371
case SIOCGMIIPHY:

0 commit comments

Comments
 (0)