diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:09:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-20 23:09:44 -0500 |
| commit | cf70a6f264f6e1a4c06553699159d94996b2f916 (patch) | |
| tree | 7a5993585e7e8b80c37cae75468fca45da6519d2 /net | |
| parent | 0b1fc9b86f49e1e73e473e06a16556ca0dce53ae (diff) | |
| parent | ad6b97fc929e5844bfd1d708ab1d74d131d7960d (diff) | |
Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 92ead3cf956b..faea8a120ee2 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, | |||
| 458 | mtu = IPV6_MIN_MTU; | 458 | mtu = IPV6_MIN_MTU; |
| 459 | t->dev->mtu = mtu; | 459 | t->dev->mtu = mtu; |
| 460 | 460 | ||
| 461 | if ((len = sizeof (*ipv6h) + ipv6h->payload_len) > mtu) { | 461 | if ((len = sizeof (*ipv6h) + ntohs(ipv6h->payload_len)) > mtu) { |
| 462 | rel_type = ICMPV6_PKT_TOOBIG; | 462 | rel_type = ICMPV6_PKT_TOOBIG; |
| 463 | rel_code = 0; | 463 | rel_code = 0; |
| 464 | rel_info = mtu; | 464 | rel_info = mtu; |