aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhuaibin Wang <huaibin.wang@6wind.com>2015-08-25 16:20:34 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-01 12:07:37 +0200
commit6d8c190531d0020870b93eee6a3933cb39fb1f52 (patch)
tree6603e64a8050c2b9a5bf361adfb5a53c1f37aa4c
parent7cd1033116c708c7e3e772cbf053fd9c98163570 (diff)
downloadlinux-linaro-stable-6d8c190531d0020870b93eee6a3933cb39fb1f52.tar.gz
ip6_gre: release cached dst on tunnel removal
[ Upstream commit d4257295ba1b389c693b79de857a96e4b7cd8ac0 ] When a tunnel is deleted, the cached dst entry should be released. This problem may prevent the removal of a netns (seen with a x-netns IPv6 gre tunnel): unregister_netdevice: waiting for lo to become free. Usage count = 3 CC: Dmitry Kozlov <xeb@mail.ru> Fixes: c12b395a4664 ("gre: Support GRE over IPv6") Signed-off-by: huaibin Wang <huaibin.wang@6wind.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ipv6/ip6_gre.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 65156a73b3f3..bf6233cdb753 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -359,6 +359,7 @@ static void ip6gre_tunnel_uninit(struct net_device *dev)
struct ip6gre_net *ign = net_generic(net, ip6gre_net_id);
ip6gre_tunnel_unlink(ign, netdev_priv(dev));
+ ip6_tnl_dst_reset(netdev_priv(dev));
dev_put(dev);
}