summaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorVadim Fedorenko <vadim.fedorenko@linux.dev>2023-03-15 16:33:02 +0100
committerDavid S. Miller <davem@davemloft.net>2023-03-17 09:21:16 +0100
commit731b73dba359e3ff00517c13aa0daa82b34ff466 (patch)
treeaf8f5e88a06656fba55a6fb7a759349450f79a36 /net/8021q
parentMerge branch 'pcs_get_state-fixes' (diff)
downloadlinux-731b73dba359e3ff00517c13aa0daa82b34ff466.tar.xz
linux-731b73dba359e3ff00517c13aa0daa82b34ff466.zip
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: 873017af7784 ("vlan: disable SIOCSHWTSTAMP in container") Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 296d0145932f..5920544e93e8 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -365,7 +365,7 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
switch (cmd) {
case SIOCSHWTSTAMP:
- if (!net_eq(dev_net(dev), &init_net))
+ if (!net_eq(dev_net(dev), dev_net(real_dev)))
break;
fallthrough;
case SIOCGMIIPHY: