diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ip_tunnel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index a4d9126c7b51..24549b4aeae2 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c | |||
@@ -854,14 +854,14 @@ int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, | |||
854 | 854 | ||
855 | rtnl_lock(); | 855 | rtnl_lock(); |
856 | itn->fb_tunnel_dev = __ip_tunnel_create(net, ops, &parms); | 856 | itn->fb_tunnel_dev = __ip_tunnel_create(net, ops, &parms); |
857 | /* FB netdevice is special: we have one, and only one per netns. | ||
858 | * Allowing to move it to another netns is clearly unsafe. | ||
859 | */ | ||
860 | itn->fb_tunnel_dev->features |= NETIF_F_NETNS_LOCAL; | ||
861 | rtnl_unlock(); | 857 | rtnl_unlock(); |
862 | 858 | ||
863 | if (IS_ERR(itn->fb_tunnel_dev)) | 859 | if (IS_ERR(itn->fb_tunnel_dev)) |
864 | return PTR_ERR(itn->fb_tunnel_dev); | 860 | return PTR_ERR(itn->fb_tunnel_dev); |
861 | /* FB netdevice is special: we have one, and only one per netns. | ||
862 | * Allowing to move it to another netns is clearly unsafe. | ||
863 | */ | ||
864 | itn->fb_tunnel_dev->features |= NETIF_F_NETNS_LOCAL; | ||
865 | 865 | ||
866 | return 0; | 866 | return 0; |
867 | } | 867 | } |