summaryrefslogtreecommitdiffstats
path: root/kernel/linux2.5/net
diff options
context:
space:
mode:
authorBart De Schuymer <bdschuym@pandora.be>2002-09-16 19:45:51 +0000
committerBart De Schuymer <bdschuym@pandora.be>2002-09-16 19:45:51 +0000
commitc84b4fc244292e65c85ce3651556871788c2e2ab (patch)
tree9f94234bd8cd88514029aad0528f9eed554e3b0b /kernel/linux2.5/net
parent111e233e5aec0592f70a7c421f007902aee64449 (diff)
cleanup brouter interface, update to 2.5.35
Diffstat (limited to 'kernel/linux2.5/net')
-rw-r--r--kernel/linux2.5/net/bridge/br_input.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/kernel/linux2.5/net/bridge/br_input.c b/kernel/linux2.5/net/bridge/br_input.c
index 1cbd914..d3956cd 100644
--- a/kernel/linux2.5/net/bridge/br_input.c
+++ b/kernel/linux2.5/net/bridge/br_input.c
@@ -5,7 +5,7 @@
* Authors:
* Lennert Buytenhek <buytenh@gnu.org>
*
- * $Id: br_input.c,v 1.2 2002/09/10 17:34:09 bdschuym Exp $
+ * $Id: br_input.c,v 1.3 2002/09/16 19:45:51 bdschuym Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,10 +19,6 @@
#include <linux/if_bridge.h>
#include <linux/netfilter_bridge.h>
#include "br_private.h"
-#if defined(CONFIG_BRIDGE_EBT_BROUTE) || \
- defined(CONFIG_BRIDGE_EBT_BROUTE_MODULE)
-#include <linux/netfilter.h>
-#endif
unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
@@ -153,12 +149,9 @@ int br_handle_frame(struct sk_buff *skb)
goto handle_special_frame;
if (p->state == BR_STATE_FORWARDING) {
-#if defined(CONFIG_BRIDGE_EBT_BROUTE) || \
- defined(CONFIG_BRIDGE_EBT_BROUTE_MODULE)
- if (broute_decision && broute_decision(NF_BR_BROUTING, &skb,
- skb->dev, NULL, NULL) == NF_DROP)
+ if (br_should_route_hook && br_should_route_hook(&skb))
return -1;
-#endif
+
NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
br_handle_frame_finish);
read_unlock(&br->lock);