All of lore.kernel.org
 help / color / mirror / Atom feed
* [NETFILTER]: Fix table iteration breakage in {ip6,arp}_tables
@ 2005-11-27  4:44 Patrick McHardy
  2005-11-28  4:45 ` David S. Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Patrick McHardy @ 2005-11-27  4:44 UTC (permalink / raw)
  To: David S. Miller; +Cc: Netfilter Development Mailinglist

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

Another fix for the iptables NUMA optimization.


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1623 bytes --]

[NETFILTER]: Fix table iteration breakage in {ip6,arp}_tables

Fix breakage from the NUMA optimization, newinfo->entries
is an array now.

Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit f79000270d87887521fdc81a969b84b709722cfc
tree aa36c4d49ae0fa0397402e7111415f5f18d44302
parent 34166a04163effbc5403dc4017ec00429a320013
author Patrick McHardy <kaber@trash.net> Sun, 27 Nov 2005 05:42:05 +0100
committer Patrick McHardy <kaber@trash.net> Sun, 27 Nov 2005 05:42:05 +0100

 net/ipv4/netfilter/arp_tables.c |    2 +-
 net/ipv6/netfilter/ip6_tables.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index 54cdb18..bba1563 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -705,7 +705,7 @@ static int translate_table(const char *n
 	i = 0;
 
 	/* Walk through entries, checking offsets. */
-	ret = ARPT_ENTRY_ITERATE(newinfo->entries, newinfo->size,
+	ret = ARPT_ENTRY_ITERATE(entry0, newinfo->size,
 				 check_entry_size_and_hooks,
 				 newinfo,
 				 entry0,
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index ac1e112..f7b9317 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -952,7 +952,7 @@ translate_table(const char *name,
 	duprintf("translate_table: size %u\n", newinfo->size);
 	i = 0;
 	/* Walk through entries, checking offsets. */
-	ret = IP6T_ENTRY_ITERATE(newinfo->entries, newinfo->size,
+	ret = IP6T_ENTRY_ITERATE(entry0, newinfo->size,
 				check_entry_size_and_hooks,
 				newinfo,
 				entry0,

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

* Re: [NETFILTER]: Fix table iteration breakage in {ip6,arp}_tables
  2005-11-27  4:44 [NETFILTER]: Fix table iteration breakage in {ip6,arp}_tables Patrick McHardy
@ 2005-11-28  4:45 ` David S. Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2005-11-28  4:45 UTC (permalink / raw)
  To: kaber; +Cc: netfilter-devel

From: Patrick McHardy <kaber@trash.net>
Date: Sun, 27 Nov 2005 05:44:06 +0100

> Another fix for the iptables NUMA optimization.

Also applied, thanks Patrick.

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

end of thread, other threads:[~2005-11-28  4:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-27  4:44 [NETFILTER]: Fix table iteration breakage in {ip6,arp}_tables Patrick McHardy
2005-11-28  4:45 ` David S. Miller

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.