diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 21:12:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 21:12:47 +0100 |
| commit | 4ada8107f465b97326751de66d3c11ed78bf8214 (patch) | |
| tree | c25db4b4b8f9297b61d357b6df33ca106901f84f /include | |
| parent | gro: Fix legacy path napi_complete crash (diff) | |
| parent | netfilter: conntrack: check for NEXTHDR_NONE before header sanity checking (diff) | |
| download | linux-4ada8107f465b97326751de66d3c11ed78bf8214.tar.xz linux-4ada8107f465b97326751de66d3c11ed78bf8214.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index c25068e38516..5a449b44ba33 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -62,7 +62,8 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb) 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); + if (likely(ret == NF_ACCEPT)) + nf_ct_deliver_cached_events(ct); } return ret; } |