From f47216f379b1a5a41bd54155529855abb3edd38a Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Mon, 8 Nov 2010 20:06:30 +0900
Subject: [PATCH] --- yaml --- r: 236577 b: refs/heads/master c:
 ea2c73afc23db3084fd857b027446c38fc7ff2c9 h: refs/heads/master i:   236575:
 de4a56ce68d8d20213b3002f8ce82d4fe6f384ce v: v3

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

diff --git a/[refs] b/[refs]
index a0ac5a90c309..782c35c2bcf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9e5eee8733739f13a204132b502494b3f494f3b
+refs/heads/master: ea2c73afc23db3084fd857b027446c38fc7ff2c9
diff --git a/trunk/net/netfilter/ipvs/ip_vs_conn.c b/trunk/net/netfilter/ipvs/ip_vs_conn.c
index 64a9ca314100..261db1a17633 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_conn.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_conn.c
@@ -354,7 +354,7 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p)
 
 	list_for_each_entry(cp, &ip_vs_conn_tab[hash], c_list) {
 		if (p->pe_data && p->pe->ct_match) {
-			if (p->pe->ct_match(p, cp))
+			if (p->pe == cp->pe && p->pe->ct_match(p, cp))
 				goto out;
 			continue;
 		}