net: fix tunnels in netns after ndo_ changes

[net-next-2.6.git] / net / ipv4 / ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 9eb437cb821a2348512caf0ab360b407ba9e82b0..5079dfbc6f38b1423b537cd9f8ba27ab2a08c685 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -793,9 +793,9 @@ static int ipip_init_net(struct net *net)
                err = -ENOMEM;
                goto err_alloc_dev;
        }
+       dev_net_set(ipn->fb_tunnel_dev, net);
 
        ipip_fb_tunnel_init(ipn->fb_tunnel_dev);
-       dev_net_set(ipn->fb_tunnel_dev, net);
 
        if ((err = register_netdev(ipn->fb_tunnel_dev)))
                goto err_reg_dev;