[PATCH] mismerge in net/ipv6/netfilter/ip6_tables.c

[Al Viro]

... duh

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
----
diff -urN RC14-rc4-git4-base/net/ipv6/netfilter/ip6_tables.c current/net/ipv6/netfilter/ip6_tables.c
--- RC14-rc4-git4-base/net/ipv6/netfilter/ip6_tables.c	2005-10-15 16:21:34.000000000 -0400
+++ current/net/ipv6/netfilter/ip6_tables.c	2005-10-15 17:49:22.000000000 -0400
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/