diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 13:27:34 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 13:27:34 -0500 |
commit | f3b270a47882b958e9e3c5bd86894e3a7072899a (patch) | |
tree | de3bdfd5d67e8310257b93ac3d8d703599b9d929 /net/ipv6/ip6_tunnel.c | |
parent | 116ad29d9839610d2811a1962cac7f3f2a9f9295 (diff) | |
parent | b9a33cebac70d6f67a769ce8d4078fee2b254ada (diff) |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index faea8a120ee..48597538db3 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -884,6 +884,7 @@ ip6ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p) t->parms.encap_limit = p->encap_limit; t->parms.flowinfo = p->flowinfo; t->parms.link = p->link; + ip6_tnl_dst_reset(t); ip6ip6_tnl_link_config(t); return 0; } |