From: Patrick McHardy <kaber@trash.net>
Date: Wed, 18 Feb 2009 14:30:34 +0000 (+0100)
Subject: netfilter: nf_conntrack: don't try to deliver events for untracked connections
X-Git-Tag: v2.6.29-rc7~13^2~20^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5962fc6d5fff09c8e6fb8cadcb18327a0f4277f7;p=~emulex%2Finfiniband.git

netfilter: nf_conntrack: don't try to deliver events for untracked connections

The untracked conntrack actually does usually have events marked for
delivery as its not special-cased in that part of the code. Skip the
actual delivery since it impacts performance noticeably.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index e78afe7f28e..c25068e3851 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -59,7 +59,7 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb)
 	struct nf_conn *ct = (struct nf_conn *)skb->nfct;
 	int ret = NF_ACCEPT;
 
-	if (ct) {
+	if (ct && ct != &nf_conntrack_untracked) {
 		if (!nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct))
 			ret = __nf_conntrack_confirm(skb);
 		nf_ct_deliver_cached_events(ct);