aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_gre.c2
-rw-r--r--net/ipv4/ipip.c2
-rw-r--r--net/ipv6/ip6_tunnel.c2
-rw-r--r--net/ipv6/sit.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index bf5b338f1343..0101521f366b 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1268,9 +1268,9 @@ static int ipgre_init_net(struct net *net)
1268 err = -ENOMEM; 1268 err = -ENOMEM;
1269 goto err_alloc_dev; 1269 goto err_alloc_dev;
1270 } 1270 }
1271 dev_net_set(ign->fb_tunnel_dev, net);
1271 1272
1272 ipgre_fb_tunnel_init(ign->fb_tunnel_dev); 1273 ipgre_fb_tunnel_init(ign->fb_tunnel_dev);
1273 dev_net_set(ign->fb_tunnel_dev, net);
1274 ign->fb_tunnel_dev->rtnl_link_ops = &ipgre_link_ops; 1274 ign->fb_tunnel_dev->rtnl_link_ops = &ipgre_link_ops;
1275 1275
1276 if ((err = register_netdev(ign->fb_tunnel_dev))) 1276 if ((err = register_netdev(ign->fb_tunnel_dev)))
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 9eb437cb821a..5079dfbc6f38 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -793,9 +793,9 @@ static int ipip_init_net(struct net *net)
793 err = -ENOMEM; 793 err = -ENOMEM;
794 goto err_alloc_dev; 794 goto err_alloc_dev;
795 } 795 }
796 dev_net_set(ipn->fb_tunnel_dev, net);
796 797
797 ipip_fb_tunnel_init(ipn->fb_tunnel_dev); 798 ipip_fb_tunnel_init(ipn->fb_tunnel_dev);
798 dev_net_set(ipn->fb_tunnel_dev, net);
799 799
800 if ((err = register_netdev(ipn->fb_tunnel_dev))) 800 if ((err = register_netdev(ipn->fb_tunnel_dev)))
801 goto err_reg_dev; 801 goto err_reg_dev;
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;