linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 2994387..188cc1a 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -13,62 +13,41 @@
  *     2 of the License, or (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
-#include <linux/llc.h>
-#include <net/llc.h>
 
 #include "br_private.h"
 
 int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
 
-static struct llc_sap *br_stp_sap;
-
 static int __init br_init(void)
 {
-       int err;
-
-       br_stp_sap = llc_sap_open(LLC_SAP_BSPAN, br_stp_rcv);
-       if (!br_stp_sap) {
-               printk(KERN_ERR "bridge: can't register sap for STP\n");
-               return -EADDRINUSE;
-       }
-
        br_fdb_init();
 
-       err = br_netfilter_init();
-       if (err)
-               goto err_out1;
-
-       err = register_netdevice_notifier(&br_device_notifier);
-       if (err)
-               goto err_out2;
-
-       br_netlink_init();
+#ifdef CONFIG_BRIDGE_NETFILTER
+       if (br_netfilter_init())
+               return 1;
+#endif
        brioctl_set(br_ioctl_deviceless_stub);
        br_handle_frame_hook = br_handle_frame;
 
        br_fdb_get_hook = br_fdb_get;
        br_fdb_put_hook = br_fdb_put;
 
-       return 0;
+       register_netdevice_notifier(&br_device_notifier);
 
-err_out2:
-       br_netfilter_fini();
-err_out1:
-       llc_sap_put(br_stp_sap);
-       return err;
+       return 0;
 }
 
 static void __exit br_deinit(void)
 {
-       rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
-
-       br_netlink_fini();
+#ifdef CONFIG_BRIDGE_NETFILTER
        br_netfilter_fini();
+#endif
        unregister_netdevice_notifier(&br_device_notifier);
        brioctl_set(NULL);
 
@@ -76,7 +55,6 @@ static void __exit br_deinit(void)
 
        synchronize_net();
 
-       llc_sap_put(br_stp_sap);
        br_fdb_get_hook = NULL;
        br_fdb_put_hook = NULL;