---

yaml --- r: 13652 b: refs/heads/master c: 5fd52fe h: refs/heads/master v: v3
git-mirror · Nov 9, 2005 · bb56174 · bb56174
1 parent 38a7b9b
commit bb56174
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }