aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2006-08-22 00:32:23 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 14:55:27 -0700
commit1a31526baeed30aaa70503cee0ab281f78cae0d6 (patch)
treebf54c585c3c3d3de92f76645cd40ee5c4fb2d2db /net/netfilter
parentb3a27bfba51d445784eb0cd6451b73a73fb69cf9 (diff)
downloadkernel_samsung_smdk4412-1a31526baeed30aaa70503cee0ab281f78cae0d6.zip
kernel_samsung_smdk4412-1a31526baeed30aaa70503cee0ab281f78cae0d6.tar.gz
kernel_samsung_smdk4412-1a31526baeed30aaa70503cee0ab281f78cae0d6.tar.bz2
[NETFILTER]: ctnetlink: remove impossible events tests for updates
IPCT_HELPER and IPCT_NATINFO bits are never set on updates. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index dc4f081..8cd85cf 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -339,11 +339,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
/* dump everything */
events = ~0UL;
group = NFNLGRP_CONNTRACK_NEW;
- } else if (events & (IPCT_STATUS |
- IPCT_PROTOINFO |
- IPCT_HELPER |
- IPCT_HELPINFO |
- IPCT_NATINFO)) {
+ } else if (events & (IPCT_STATUS | IPCT_PROTOINFO)) {
type = IPCTNL_MSG_CT_NEW;
group = NFNLGRP_CONNTRACK_UPDATE;
} else