From 8b3ff56fe6513d55ed97189c365331cd832d6d07 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 18 Feb 2009 15:30:34 +0100 Subject: [PATCH] --- yaml --- r: 131945 b: refs/heads/master c: 5962fc6d5fff09c8e6fb8cadcb18327a0f4277f7 h: refs/heads/master i: 131943: 7dd4cbe69134fda8f822c4a917ae49b55db524f6 v: v3 --- [refs] | 2 +- trunk/include/net/netfilter/nf_conntrack_core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e358560df456..79a9ffb42869 100644 --- 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 index e78afe7f28e3..c25068e38516 100644 --- 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);