]> www.infradead.org Git - users/hch/misc.git/commitdiff
net: ip_tunnel: Don't set tunnel->net in ip_tunnel_init()
authorXiao Liang <shaw.leon@gmail.com>
Wed, 19 Feb 2025 12:50:31 +0000 (20:50 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 21 Feb 2025 23:28:02 +0000 (15:28 -0800)
ip_tunnel_init() is called from register_netdevice(). In all code paths
reaching here, tunnel->net should already have been set (either in
ip_tunnel_newlink() or __ip_tunnel_create()). So don't set it again.

Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250219125039.18024-6-shaw.leon@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/ip_tunnel.c

index 09b73acf037ae254dbe464f785bf8b34223521df..dd4b4e5be998a378ccb2ce6c7ee953742bcbf0e4 100644 (file)
@@ -1326,7 +1326,6 @@ int ip_tunnel_init(struct net_device *dev)
        }
 
        tunnel->dev = dev;
-       tunnel->net = dev_net(dev);
        strscpy(tunnel->parms.name, dev->name);
        iph->version            = 4;
        iph->ihl                = 5;