From b691b830a34d8fc063db9f4e299cf89676fbef82 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Tue, 10 Sep 2002 17:35:52 +0000 Subject: *** empty log message *** --- br-nf-bds/linux2.5/net/bridge/br_forward.c | 5 ++++- br-nf-bds/linux2.5/net/bridge/br_input.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'br-nf-bds/linux2.5') diff --git a/br-nf-bds/linux2.5/net/bridge/br_forward.c b/br-nf-bds/linux2.5/net/bridge/br_forward.c index 1854fa4..a8cc91f 100644 --- a/br-nf-bds/linux2.5/net/bridge/br_forward.c +++ b/br-nf-bds/linux2.5/net/bridge/br_forward.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek * - * $Id: br_forward.c,v 1.1 2002/08/24 09:28:29 bdschuym Exp $ + * $Id: br_forward.c,v 1.2 2002/09/10 17:38:19 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -49,6 +49,9 @@ int br_forward_finish(struct sk_buff *skb) static void __br_deliver(struct net_bridge_port *to, struct sk_buff *skb) { skb->dev = to->dev; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; +#endif NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, br_forward_finish); } diff --git a/br-nf-bds/linux2.5/net/bridge/br_input.c b/br-nf-bds/linux2.5/net/bridge/br_input.c index d467dda..bcfeada 100644 --- a/br-nf-bds/linux2.5/net/bridge/br_input.c +++ b/br-nf-bds/linux2.5/net/bridge/br_input.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek * - * $Id: br_input.c,v 1.1 2002/08/24 09:28:29 bdschuym Exp $ + * $Id: br_input.c,v 1.2 2002/09/10 17:36:25 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -28,6 +28,9 @@ 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_rx(skb); return 0; -- cgit v1.2.3