summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2013-10-01 11:34:48 +0200
committerDavid S. Miller <davem@davemloft.net>2013-10-01 12:42:16 -0400
commit67013282627185aeec2fb92c75868dcace0d25b4 (patch)
treed3d6ade19f30849b05b27c3ebeb9a77c5c0f5eee /net
parent3e08f4a72f689c6296d336c2aab4bddd60c93ae2 (diff)
downloadlinux-67013282627185aeec2fb92c75868dcace0d25b4.tar.gz
linux-67013282627185aeec2fb92c75868dcace0d25b4.tar.bz2
linux-67013282627185aeec2fb92c75868dcace0d25b4.zip
ip_tunnel: Add fallback tunnels to the hash lists
Currently we can not update the tunnel parameters of the fallback tunnels because we don't find them in the hash lists. Fix this by adding them on initialization. Bug was introduced with commit c544193214 ("GRE: Refactor GRE tunneling code.") Cc: Pravin Shelar <pshelar@nicira.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_tunnel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index dfc6d8a3caa7..895a3535321b 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -853,8 +853,10 @@ int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,
/* FB netdevice is special: we have one, and only one per netns.
* Allowing to move it to another netns is clearly unsafe.
*/
- if (!IS_ERR(itn->fb_tunnel_dev))
+ if (!IS_ERR(itn->fb_tunnel_dev)) {
itn->fb_tunnel_dev->features |= NETIF_F_NETNS_LOCAL;
+ ip_tunnel_add(itn, netdev_priv(itn->fb_tunnel_dev));
+ }
rtnl_unlock();
return PTR_RET(itn->fb_tunnel_dev);