diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:29:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:29:07 +0200 |
| commit | bac931259addd4ca8f705b534ab693c1b367ca1d (patch) | |
| tree | eff070cdcae6c02c315fb81a7b65a8e95596f74e /net/ipv6/icmp.c | |
| parent | x86/mce: Do not use bank 1 for APEI generated error logs (diff) | |
| parent | Linux 4.7-rc6 (diff) | |
| download | linux-bac931259addd4ca8f705b534ab693c1b367ca1d.tar.xz linux-bac931259addd4ca8f705b534ab693c1b367ca1d.zip | |
Merge tag 'v4.7-rc6' into ras/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 4527285fcaa2..a4fa84076969 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -98,7 +98,7 @@ static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (!(type & ICMPV6_INFOMSG_MASK)) if (icmp6->icmp6_type == ICMPV6_ECHO_REQUEST) - ping_err(skb, offset, info); + ping_err(skb, offset, ntohl(info)); } static int icmpv6_rcv(struct sk_buff *skb); |