diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-04 17:28:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-04 17:28:58 -0500 |
commit | bd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch) | |
tree | e96ef46426d293b730a305b5185ba5412c9172d4 /include/net/netfilter/nf_conntrack_ecache.h | |
parent | 2b7bcebf958c74124220ee8103024def8597b36c (diff) | |
parent | 1e6d93e45b231b3ae87c01902ede2315aacfe976 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/netfilter/nf_conntrack_ecache.h')
-rw-r--r-- | include/net/netfilter/nf_conntrack_ecache.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h index 8fdb04b8cce..4283508b3e1 100644 --- a/include/net/netfilter/nf_conntrack_ecache.h +++ b/include/net/netfilter/nf_conntrack_ecache.h | |||
@@ -85,9 +85,6 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) | |||
85 | if (e == NULL) | 85 | if (e == NULL) |
86 | return; | 86 | return; |
87 | 87 | ||
88 | if (!(e->ctmask & (1 << event))) | ||
89 | return; | ||
90 | |||
91 | set_bit(event, &e->cache); | 88 | set_bit(event, &e->cache); |
92 | } | 89 | } |
93 | 90 | ||