Message ID | 20230315153302.1472902-1-vadfed@meta.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 731b73dba359e3ff00517c13aa0daa82b34ff466 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] vlan: partially enable SIOCSHWTSTAMP in container | expand |
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Wed, 15 Mar 2023 08:33:02 -0700 you wrote: > From: Vadim Fedorenko <vadim.fedorenko@linux.dev> > > 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> > > [...] Here is the summary with links: - [net] vlan: partially enable SIOCSHWTSTAMP in container https://git.kernel.org/netdev/net-next/c/731b73dba359 You are awesome, thank you!
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: