Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git...

[linux-2.6] / net / bridge / br_input.c

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 8f5f2e7309920d4047571b2237b530fe1c791dfc..9a45e6279c57c4f1eebb005f674b0284defe1151 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -23,11 +23,7 @@ const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
 static int br_pass_frame_up_finish(struct sk_buff *skb)
 {
-#ifdef CONFIG_NETFILTER_DEBUG
-       skb->nf_debug = 0;
-#endif
        netif_receive_skb(skb);
-
        return 0;
 }