diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-02 18:52:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-02 18:52:23 -0500 |
| commit | 0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4 (patch) | |
| tree | ead6485944f5c1db64c9f6b6dd7ef0f9e4842a67 /include | |
| parent | 34a6ef381d402c6547aa9abb8a74b0262ae8255f (diff) | |
| parent | 3db7e93d3308fb882884b9f024235d6fbf542034 (diff) | |
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_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 96ba5f7dcab6..349cefedc9f3 100644 --- a/include/net/netfilter/nf_conntrack_ecache.h +++ b/include/net/netfilter/nf_conntrack_ecache.h | |||
| @@ -77,9 +77,6 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) | |||
| 77 | if (e == NULL) | 77 | if (e == NULL) |
| 78 | return; | 78 | return; |
| 79 | 79 | ||
| 80 | if (!(e->ctmask & (1 << event))) | ||
| 81 | return; | ||
| 82 | |||
| 83 | set_bit(event, &e->cache); | 80 | set_bit(event, &e->cache); |
| 84 | } | 81 | } |
| 85 | 82 | ||