From ef290effa52b30ea3a40ab7af40dde6a5cd89d60 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Thu, 29 Aug 2002 21:18:10 +0000 Subject: oops --- kernel/linux/net/Config.in | 3 --- kernel/linux/net/bridge/Makefile | 2 -- kernel/linux/net/bridge/br.c | 10 +--------- kernel/linux/net/bridge/br_input.c | 4 ++-- kernel/linux/net/bridge/br_private.h | 10 +--------- 5 files changed, 4 insertions(+), 25 deletions(-) (limited to 'kernel') diff --git a/kernel/linux/net/Config.in b/kernel/linux/net/Config.in index 1e6279f..177e90c 100644 --- a/kernel/linux/net/Config.in +++ b/kernel/linux/net/Config.in @@ -69,9 +69,6 @@ if [ "$CONFIG_BRIDGE" != "n" -a "$CONFIG_NETFILTER" != "n" ]; then source net/bridge/netfilter/Config.in fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - if [ "$CONFIG_BRIDGE" != "n" -a "$CONFIG_NETFILTER" != "n" ]; then - bool ' netfilter (firewalling) support' CONFIG_BRIDGE_NF - fi tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25 tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB bool '802.2 LLC (EXPERIMENTAL)' CONFIG_LLC diff --git a/kernel/linux/net/bridge/Makefile b/kernel/linux/net/bridge/Makefile index d069395..77ed459 100644 --- a/kernel/linux/net/bridge/Makefile +++ b/kernel/linux/net/bridge/Makefile @@ -19,6 +19,4 @@ obj-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \ br_stp_if.o br_stp_timer.o obj-m := $(O_TARGET) -obj-$(CONFIG_BRIDGE_NF) += br_netfilter.o - include $(TOPDIR)/Rules.make diff --git a/kernel/linux/net/bridge/br.c b/kernel/linux/net/bridge/br.c index 15ce0ca..c1fc9da 100644 --- a/kernel/linux/net/bridge/br.c +++ b/kernel/linux/net/bridge/br.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek * - * $Id: br.c,v 1.2 2002/08/22 17:49:34 bdschuym Exp $ + * $Id: br.c,v 1.3 2002/08/29 21:23: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 @@ -50,11 +50,6 @@ static int __init br_init(void) { printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n"); -#ifdef CONFIG_BRIDGE_NF - if (br_netfilter_init()) - return 1; -#endif - br_handle_frame_hook = br_handle_frame; br_ioctl_hook = br_ioctl_deviceless_stub; #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) @@ -78,9 +73,6 @@ static void __br_clear_ioctl_hook(void) static void __exit br_deinit(void) { -#ifdef CONFIG_BRIDGE_NF - br_netfilter_fini(); -#endif unregister_netdevice_notifier(&br_device_notifier); br_call_ioctl_atomic(__br_clear_ioctl_hook); net_call_rx_atomic(__br_clear_frame_hook); diff --git a/kernel/linux/net/bridge/br_input.c b/kernel/linux/net/bridge/br_input.c index 352a63b..0f9a51d 100644 --- a/kernel/linux/net/bridge/br_input.c +++ b/kernel/linux/net/bridge/br_input.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek * - * $Id: br_input.c,v 1.3 2002/08/23 16:56:52 bdschuym Exp $ + * $Id: br_input.c,v 1.4 2002/08/29 21:27:53 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -50,7 +50,7 @@ static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb) br_pass_frame_up_finish); } -int br_handle_frame_finish(struct sk_buff *skb) +static int br_handle_frame_finish(struct sk_buff *skb) { struct net_bridge *br; unsigned char *dest; diff --git a/kernel/linux/net/bridge/br_private.h b/kernel/linux/net/bridge/br_private.h index 1f41044..df41d0f 100644 --- a/kernel/linux/net/bridge/br_private.h +++ b/kernel/linux/net/bridge/br_private.h @@ -4,7 +4,7 @@ * Authors: * Lennert Buytenhek * - * $Id: br_private.h,v 1.2 2002/08/22 17:49:34 bdschuym Exp $ + * $Id: br_private.h,v 1.3 2002/08/29 21:25:05 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -120,7 +120,6 @@ extern void br_dec_use_count(void); extern void br_inc_use_count(void); /* br_device.c */ -extern int br_dev_xmit(struct sk_buff *skb, struct net_device *dev); extern void br_dev_setup(struct net_device *dev); extern int br_dev_xmit(struct sk_buff *skb, struct net_device *dev); @@ -145,10 +144,8 @@ extern void br_fdb_insert(struct net_bridge *br, /* br_forward.c */ extern void br_deliver(struct net_bridge_port *to, struct sk_buff *skb); -extern int br_dev_queue_push_xmit(struct sk_buff *skb); extern void br_forward(struct net_bridge_port *to, struct sk_buff *skb); -extern int br_forward_finish(struct sk_buff *skb); extern void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, int clone); @@ -169,7 +166,6 @@ extern void br_get_port_ifindices(struct net_bridge *br, int *ifindices); /* br_input.c */ -extern int br_handle_frame_finish(struct sk_buff *skb); extern int br_handle_frame(struct sk_buff *skb); /* br_ioctl.c */ @@ -181,10 +177,6 @@ extern int br_ioctl(struct net_bridge *br, unsigned long arg2); extern int br_ioctl_deviceless_stub(unsigned long arg); -/* br_netfilter.c */ -extern int br_netfilter_init(void); -extern void br_netfilter_fini(void); - /* br_stp.c */ extern int br_is_root_bridge(struct net_bridge *br); extern struct net_bridge_port *br_get_port(struct net_bridge *br, -- cgit v1.2.3