From 38a7b9b611996d637adf40cab55e76ad8eaa2fc8 Mon Sep 17 00:00:00 2001
From: Krzysztof Piotr Oledzki <ole@ans.pl>
Date: Wed, 9 Nov 2005 13:04:08 -0800
Subject: [PATCH] --- yaml --- r: 13651 b: refs/heads/master c:
 439a9994bb6ae3c7cab1f0b776bca6bc7aa58a11 h: refs/heads/master i:   13649:
 e2a9a4966521c0d8d013d7981c4ef3998e112eeb   13647:
 7d45db564c4b3022bd10f5600affeac4a646896d v: v3

---
 [refs]                                             | 2 +-
 trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6a6ab119ddf9..14dc1e270fdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a856a19a9f3ee14fc0d555470f3af138aeb0245c
+refs/heads/master: 439a9994bb6ae3c7cab1f0b776bca6bc7aa58a11
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
index 9481d159acb6..083951e20690 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
@@ -296,7 +296,8 @@ static int icmp_nfattr_to_tuple(struct nfattr *tb[],
 				struct ip_conntrack_tuple *tuple)
 {
 	if (!tb[CTA_PROTO_ICMP_TYPE-1]
-	    || !tb[CTA_PROTO_ICMP_CODE-1])
+	    || !tb[CTA_PROTO_ICMP_CODE-1]
+	    || !tb[CTA_PROTO_ICMP_ID-1])
 		return -1;
 
 	tuple->dst.u.icmp.type =