git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[pandora-kernel.git]
/
include
/
net
/
netfilter
/
nf_conntrack_ecache.h
diff --git
a/include/net/netfilter/nf_conntrack_ecache.h
b/include/net/netfilter/nf_conntrack_ecache.h
index
96ba5f7
..
349cefe
100644
(file)
--- 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);
}