From 2619aa4851ce2a24378bfeb5cae05c4c86f044e8 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 24 Apr 2006 17:17:49 -0700 Subject: [PATCH] --- yaml --- r: 26171 b: refs/heads/master c: e4a79ef811505a8bf8d8edfda8602e23cb2fbdb0 h: refs/heads/master i: 26169: a19d5a13f1e1eec6e76492bc32a7a46941278cb3 26167: 2160b2d6a1e9ea8b84486ccf6b79b91b593ee8ae v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/ip6_tables.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 8f127e78acb0..02251fd1dfa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c16b774c7a9b1684b0ff10121915903e9f0cf6c +refs/heads/master: e4a79ef811505a8bf8d8edfda8602e23cb2fbdb0 diff --git a/trunk/net/ipv6/netfilter/ip6_tables.c b/trunk/net/ipv6/netfilter/ip6_tables.c index 642b4b11464f..0a673038344f 100644 --- a/trunk/net/ipv6/netfilter/ip6_tables.c +++ b/trunk/net/ipv6/netfilter/ip6_tables.c @@ -288,19 +288,6 @@ ip6t_do_table(struct sk_buff **pskb, table_base = (void *)private->entries[smp_processor_id()]; e = get_entry(table_base, private->hook_entry[hook]); -#ifdef CONFIG_NETFILTER_DEBUG - /* Check noone else using our table */ - if (((struct ip6t_entry *)table_base)->comefrom != 0xdead57ac - && ((struct ip6t_entry *)table_base)->comefrom != 0xeeeeeeec) { - printk("ASSERT: CPU #%u, %s comefrom(%p) = %X\n", - smp_processor_id(), - table->name, - &((struct ip6t_entry *)table_base)->comefrom, - ((struct ip6t_entry *)table_base)->comefrom); - } - ((struct ip6t_entry *)table_base)->comefrom = 0x57acc001; -#endif - /* For return from builtin chain */ back = get_entry(table_base, private->underflow[hook]);