From 4fa159a9390167943e5ca1064949d36bd759b51b Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Fri, 13 Jan 2012 22:55:54 +0100
Subject: [PATCH] --- yaml --- r: 290803 b: refs/heads/master c:
 7f81c951d961bef0bf9aa55449654302b9da8185 h: refs/heads/master i:   290801:
 ae64bcc49e38a23d0b5e4b12dab11be7d4bc5b72   290799:
 c0e65afbda5ed6df6acb37463027b75d1ddde2c1 v: v3

---
 [refs]                                             | 2 +-
 trunk/include/linux/netfilter/ipset/ip_set_ahash.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 241637854970..61be9e18f508 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a7cef2a4ba64b9bf0ff9aeaa364554716c06669
+refs/heads/master: 7f81c951d961bef0bf9aa55449654302b9da8185
diff --git a/trunk/include/linux/netfilter/ipset/ip_set_ahash.h b/trunk/include/linux/netfilter/ipset/ip_set_ahash.h
index 0e5c3cf7618a..05a5d72680be 100644
--- a/trunk/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/trunk/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -1005,9 +1005,17 @@ type_pf_ttest_cidrs(struct ip_set *set, struct type_pf_elem *d, u32 timeout)
 		n = hbucket(t, key);
 		for (i = 0; i < n->pos; i++) {
 			data = ahash_tdata(n, i);
+#ifdef IP_SET_HASH_WITH_MULTI
+			if (type_pf_data_equal(data, d, &multi)) {
+				if (!type_pf_data_expired(data))
+					return type_pf_data_match(data);
+				multi = 0;
+			}
+#else
 			if (type_pf_data_equal(data, d, &multi) &&
 			    !type_pf_data_expired(data))
 				return type_pf_data_match(data);
+#endif
 		}
 	}
 	return 0;