From bb561745866cf044f2b7b197d7368ca7358e8ccc Mon Sep 17 00:00:00 2001 From: Krzysztof Piotr Oledzki Date: Wed, 9 Nov 2005 13:04:32 -0800 Subject: [PATCH] --- yaml --- r: 13652 b: refs/heads/master c: 5fd52fe0989f8c84abd8d4a40ded79d4da911744 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 14dc1e270fdb..11c4a1fb1ddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 439a9994bb6ae3c7cab1f0b776bca6bc7aa58a11 +refs/heads/master: 5fd52fe0989f8c84abd8d4a40ded79d4da911744 diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c index 083951e20690..5198f3a1e2cd 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c @@ -305,7 +305,7 @@ static int icmp_nfattr_to_tuple(struct nfattr *tb[], tuple->dst.u.icmp.code = *(u_int8_t *)NFA_DATA(tb[CTA_PROTO_ICMP_CODE-1]); tuple->src.u.icmp.id = - *(u_int8_t *)NFA_DATA(tb[CTA_PROTO_ICMP_ID-1]); + *(u_int16_t *)NFA_DATA(tb[CTA_PROTO_ICMP_ID-1]); return 0; }