diff options
Diffstat (limited to 'br-nf-bds/linux2.5/net/bridge/br_input.c')
| -rw-r--r-- | br-nf-bds/linux2.5/net/bridge/br_input.c | 12 |
1 files changed, 9 insertions, 3 deletions
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 7ad9a24..6a83e5e 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 <buytenh@gnu.org> * - * $Id: br_input.c,v 1.4 2002/09/29 19:01:05 bdschuym Exp $ + * $Id: br_input.c,v 1.5 2002/10/19 14:27:48 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,8 +154,14 @@ int br_handle_frame(struct sk_buff *skb) return -1; } - NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, - br_handle_frame_finish); +#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); read_unlock(&br->lock); return 0; } |