aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_tunnel.c2
-rw-r--r--net/ipv6/sit.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 358f001d848d..ef249ab5c93c 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1428,9 +1428,9 @@ static int ip6_tnl_init_net(struct net *net)
1428 1428
1429 if (!ip6n->fb_tnl_dev) 1429 if (!ip6n->fb_tnl_dev)
1430 goto err_alloc_dev; 1430 goto err_alloc_dev;
1431 dev_net_set(ip6n->fb_tnl_dev, net);
1431 1432
1432 ip6_fb_tnl_dev_init(ip6n->fb_tnl_dev); 1433 ip6_fb_tnl_dev_init(ip6n->fb_tnl_dev);
1433 dev_net_set(ip6n->fb_tnl_dev, net);
1434 1434
1435 err = register_netdev(ip6n->fb_tnl_dev); 1435 err = register_netdev(ip6n->fb_tnl_dev);
1436 if (err < 0) 1436 if (err < 0)
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 1ebf99a6776e..d3467e563f02 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1025,9 +1025,9 @@ static int sit_init_net(struct net *net)
1025 err = -ENOMEM; 1025 err = -ENOMEM;
1026 goto err_alloc_dev; 1026 goto err_alloc_dev;
1027 } 1027 }
1028 dev_net_set(sitn->fb_tunnel_dev, net);
1028 1029
1029 ipip6_fb_tunnel_init(sitn->fb_tunnel_dev); 1030 ipip6_fb_tunnel_init(sitn->fb_tunnel_dev);
1030 dev_net_set(sitn->fb_tunnel_dev, net);
1031 1031
1032 if ((err = register_netdev(sitn->fb_tunnel_dev))) 1032 if ((err = register_netdev(sitn->fb_tunnel_dev)))
1033 goto err_reg_dev; 1033 goto err_reg_dev;