diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-03 00:52:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-03 00:52:23 +0100 |
| commit | 0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4 (patch) | |
| tree | ead6485944f5c1db64c9f6b6dd7ef0f9e4842a67 /include/net | |
| parent | tcp_ecn is an integer not a boolean (diff) | |
| parent | netfilter: ecache: always set events bits, filter them later (diff) | |
| download | linux-0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4.tar.xz linux-0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/net')
| -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) if (e == NULL) return; - if (!(e->ctmask & (1 << event))) - return; - set_bit(event, &e->cache); } |