summaryrefslogtreecommitdiffstats
path: root/kernel/linux/net/bridge/br.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/linux/net/bridge/br.c')
-rw-r--r--kernel/linux/net/bridge/br.c10
1 files changed, 1 insertions, 9 deletions
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 <buytenh@gnu.org>
*
- * $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);