diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-20 23:12:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-20 23:12:18 -0700 |
| commit | 41499bd6766314079417d1467c466d31b8612fec (patch) | |
| tree | 5ce777cd47603977ee55059891c67b8a420e05a1 /include/net | |
| parent | 622e0ca1cd4d459f5af4f2c65f4dc0dd823cb4c3 (diff) | |
| parent | 7ea7b858f4bc4fa1645f1327cf9e72c93981aa58 (diff) | |
| download | op-kernel-dev-41499bd6766314079417d1467c466d31b8612fec.zip op-kernel-dev-41499bd6766314079417d1467c466d31b8612fec.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index dffde8e..3d7524f 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -61,7 +61,7 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb) int ret = NF_ACCEPT; if (ct && ct != &nf_conntrack_untracked) { - if (!nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct)) + if (!nf_ct_is_confirmed(ct)) ret = __nf_conntrack_confirm(skb); if (likely(ret == NF_ACCEPT)) nf_ct_deliver_cached_events(ct); |
