diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
| commit | 09e4f9029da1b53e835555c353a89c36b71233b0 (patch) | |
| tree | 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /net/ipv6/ip6_tunnel.c | |
| parent | 750b50ab5687125d8a1dc946d931b00acf016e2c (diff) | |
| parent | dbfedbb98145375106cee7ec7269611d553819dc (diff) | |
| download | talos-op-linux-09e4f9029da1b53e835555c353a89c36b71233b0.tar.gz talos-op-linux-09e4f9029da1b53e835555c353a89c36b71233b0.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 92ead3cf956b..48597538db3f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -458,7 +458,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, mtu = IPV6_MIN_MTU; t->dev->mtu = mtu; - if ((len = sizeof (*ipv6h) + ipv6h->payload_len) > mtu) { + if ((len = sizeof (*ipv6h) + ntohs(ipv6h->payload_len)) > mtu) { rel_type = ICMPV6_PKT_TOOBIG; rel_code = 0; rel_info = mtu; @@ -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; } |
