All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 8/8][CTNETLINK] Remove useless event-bit-is-set checkings on updates
@ 2006-07-25 13:27 Pablo Neira Ayuso
  2006-08-08 10:57 ` Patrick McHardy
  0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2006-07-25 13:27 UTC (permalink / raw)
  To: Netfilter Development Mailinglist; +Cc: Harald Welte, Patrick McHardy

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

IPCT_HELPER and IPCT_NATINFO bits are never set on updates.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of 
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

[-- Attachment #2: 08remove.patch --]
[-- Type: text/plain, Size: 1606 bytes --]

[CTNETLINK] Remove useless event-bit-is-set checkings on updates

IPCT_HELPER and IPCT_NATINFO bits are never set on updates.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Index: net-2.6/net/netfilter/nf_conntrack_netlink.c
===================================================================
--- net-2.6.orig/net/netfilter/nf_conntrack_netlink.c	2006-07-25 01:20:38.000000000 +0200
+++ net-2.6/net/netfilter/nf_conntrack_netlink.c	2006-07-25 01:20:49.000000000 +0200
@@ -340,11 +340,7 @@ static int ctnetlink_conntrack_event(str
 			  IPCT_STATUS |
 			  IPCT_PROTOINFO;
 		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;
 		events |= IPCT_REFRESH |
 			  IPCT_STATUS |
Index: net-2.6/net/ipv4/netfilter/ip_conntrack_netlink.c
===================================================================
--- net-2.6.orig/net/ipv4/netfilter/ip_conntrack_netlink.c	2006-07-25 01:20:38.000000000 +0200
+++ net-2.6/net/ipv4/netfilter/ip_conntrack_netlink.c	2006-07-25 01:20:49.000000000 +0200
@@ -330,11 +330,7 @@ static int ctnetlink_conntrack_event(str
 			  IPCT_STATUS |
 			  IPCT_PROTOINFO;
 		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;
 		events |= IPCT_REFRESH |
 			  IPCT_STATUS |

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 8/8][CTNETLINK] Remove useless event-bit-is-set checkings on updates
  2006-07-25 13:27 [PATCH 8/8][CTNETLINK] Remove useless event-bit-is-set checkings on updates Pablo Neira Ayuso
@ 2006-08-08 10:57 ` Patrick McHardy
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2006-08-08 10:57 UTC (permalink / raw)
  To: Pablo Neira Ayuso; +Cc: Harald Welte, Netfilter Development Mailinglist

Pablo Neira Ayuso wrote:
> IPCT_HELPER and IPCT_NATINFO bits are never set on updates.

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-08-08 10:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-25 13:27 [PATCH 8/8][CTNETLINK] Remove useless event-bit-is-set checkings on updates Pablo Neira Ayuso
2006-08-08 10:57 ` Patrick McHardy

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.