aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2006-08-22 03:32:23 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 17:55:27 -0400
commit1a31526baeed30aaa70503cee0ab281f78cae0d6 (patch)
treebf54c585c3c3d3de92f76645cd40ee5c4fb2d2db /net/ipv4
parentb3a27bfba51d445784eb0cd6451b73a73fb69cf9 (diff)
[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/ipv4')
-rw-r--r--net/ipv4/netfilter/ip_conntrack_netlink.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index ef84f43f0734..a20b0e385f1b 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -329,11 +329,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
329 /* dump everything */ 329 /* dump everything */
330 events = ~0UL; 330 events = ~0UL;
331 group = NFNLGRP_CONNTRACK_NEW; 331 group = NFNLGRP_CONNTRACK_NEW;
332 } else if (events & (IPCT_STATUS | 332 } else if (events & (IPCT_STATUS | IPCT_PROTOINFO)) {
333 IPCT_PROTOINFO |
334 IPCT_HELPER |
335 IPCT_HELPINFO |
336 IPCT_NATINFO)) {
337 type = IPCTNL_MSG_CT_NEW; 333 type = IPCTNL_MSG_CT_NEW;
338 group = NFNLGRP_CONNTRACK_UPDATE; 334 group = NFNLGRP_CONNTRACK_UPDATE;
339 } else 335 } else