From af134e25a002f112d65a115fff5662f957b7bc2c Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Mon, 21 Oct 2002 17:34:37 +0000 Subject: remove nf_bridge_alloc call --- br-nf-bds/linux2.5/net/bridge/br_input.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'br-nf-bds') 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 6a83e5e..4eb67b5 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.5 2002/10/19 14:27:48 bdschuym Exp $ + * $Id: br_input.c,v 1.6 2002/10/21 17:34:37 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -154,14 +154,8 @@ int br_handle_frame(struct sk_buff *skb) return -1; } -#ifdef CONFIG_NETFILTER - /* Used by br_netfilter.c */ - if (nf_bridge_alloc(skb) == NULL) - kfree_skb(skb); - else -#endif - NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, - NULL, br_handle_frame_finish); + NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, + br_handle_frame_finish); read_unlock(&br->lock); return 0; } -- cgit v1.2.3