diff options
author | David S. Miller <davem@davemloft.net> | 2015-08-28 06:45:31 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-28 06:45:31 +0200 |
commit | 0d36938bb82a7775c21ce0a7429f08ba13d025b6 (patch) | |
tree | f502caf5555591ee237e14e5fa96b2c005a85036 /net/ipv6 | |
parent | Merge branch 'iff_no_queue_fixups' (diff) | |
parent | Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
download | linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.xz linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_gre.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 34f121812a14..4038c694ec03 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -361,6 +361,7 @@ static void ip6gre_tunnel_uninit(struct net_device *dev) struct ip6gre_net *ign = net_generic(t->net, ip6gre_net_id); ip6gre_tunnel_unlink(ign, t); + ip6_tnl_dst_reset(t); dev_put(dev); } |