mismerge in net/ipv6/netfilter/ip6_tables.c

PATCH In review Al Viro 2 participants 2 messages Oct 15, 2005 – Oct 16, 2005

Subsystems (2)

Networking netfilter

lore

Share & tools

lore

Al Viro

author

2005-10-15 23:52 UTC #0 lore raw

PATCH 1/1 mismerge in net/ipv6/netfilter/ip6_tables.c

... duh

Signed-off-by Al Viro <[email protected]>

----

net/ipv6/netfilter/ip6_tables.c +0 -1

diff -urN RC14-rc4-git4-base/net/ipv6/netfilter/ip6_tables.c current/net/ipv6/netfilter/ip6_tables.c
@@ -975,7 +975,6 @@
 		struct ip6t_entry *table_base;
 		unsigned int i;
 
-		for (i = 0; i < num_possible_cpus(); i++) {
 		for_each_cpu(i) {
 			table_base =
 				(void *)newinfo->entries

David S. Miller

maintainer

2005-10-16 07:08 UTC #1 lore raw

From: Al Viro <[email protected]>
Date: Sun, 16 Oct 2005 00:52:45 +0100

Quoted 3 lines

... duh
Signed-off-by Al Viro <[email protected]>

Andrew noticed that earlier, I send Linus a fix already :)