Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 0 insertions, 3 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index b78a53586804..06e7cdaeedc5 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -484,9 +484,6 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from)
         to->nf_bridge = from->nf_bridge;
         nf_bridge_get(to->nf_bridge);
 #endif
-#ifdef CONFIG_NETFILTER_DEBUG
-        to->nf_debug = from->nf_debug;
-#endif
 #endif
 }