Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 12da21a..2994387 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -13,7 +13,6 @@
  *     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>
@@ -30,36 +29,46 @@ 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 -EBUSY;
+               return -EADDRINUSE;
        }
 
        br_fdb_init();
 
-#ifdef CONFIG_BRIDGE_NETFILTER
-       if (br_netfilter_init())
-               return 1;
-#endif
+       err = br_netfilter_init();
+       if (err)
+               goto err_out1;
+
+       err = register_netdevice_notifier(&br_device_notifier);
+       if (err)
+               goto err_out2;
+
+       br_netlink_init();
        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;
 
-       register_netdevice_notifier(&br_device_notifier);
-
        return 0;
+
+err_out2:
+       br_netfilter_fini();
+err_out1:
+       llc_sap_put(br_stp_sap);
+       return err;
 }
 
 static void __exit br_deinit(void)
 {
        rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
 
-#ifdef CONFIG_BRIDGE_NETFILTER
+       br_netlink_fini();
        br_netfilter_fini();
-#endif
        unregister_netdevice_notifier(&br_device_notifier);
        brioctl_set(NULL);