diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-30 10:10:04 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-30 10:10:04 -0700 |
| commit | 18cb0eedcc22a6df7da9e106d0c8741e647e4f87 (patch) | |
| tree | 6be93a8dc6f7823467287ce273cd15fd4e06ad29 /net/ipv6/icmp.c | |
| parent | ec5cb2fe853f9002381386513d7147ab6566c64a (diff) | |
| parent | ba52437821164deacf9af90d559f2e3f4888ff28 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
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 a3ec7a77a1ee..41e5c9520c7d 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); |