---

yaml --- r: 131945 b: refs/heads/master c: 5962fc6 h: refs/heads/master i: 131943: 7dd4cbe v: v3
git-mirror · Feb 18, 2009 · 8b3ff56 · 8b3ff56
1 parent 0911ceb
commit 8b3ff56
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: 2c6764b743f9d25dd0806a417f06920dcbd0f599
+refs/heads/master: 5962fc6d5fff09c8e6fb8cadcb18327a0f4277f7
diff --git a/trunk/include/net/netfilter/nf_conntrack_core.h b/trunk/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);