netfilter: xtables: move extension arguments into compound structure (3/6)

[safe/jmp/linux-2.6] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 12da21a..4d2c1f1 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -5,15 +5,12 @@
  *     Authors:
  *     Lennert Buytenhek               <buytenh@gnu.org>
  *
- *     $Id: br.c,v 1.47 2001/12/24 00:56:41 davem Exp $
- *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
  *     as published by the Free Software Foundation; either version
  *     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>
@@ -21,53 +18,83 @@
 #include <linux/init.h>
 #include <linux/llc.h>
 #include <net/llc.h>
+#include <net/stp.h>
 
 #include "br_private.h"
 
-int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
+int (*br_should_route_hook)(struct sk_buff *skb);
+
+static const struct stp_proto br_stp_proto = {
+       .rcv    = br_stp_rcv,
+};
 
-static struct llc_sap *br_stp_sap;
+static struct pernet_operations br_net_ops = {
+       .exit   = br_net_exit,
+};
 
 static int __init br_init(void)
 {
-       br_stp_sap = llc_sap_open(LLC_SAP_BSPAN, br_stp_rcv);
-       if (!br_stp_sap) {
+       int err;
+
+       err = stp_proto_register(&br_stp_proto);
+       if (err < 0) {
                printk(KERN_ERR "bridge: can't register sap for STP\n");
-               return -EBUSY;
+               return err;
        }
 
-       br_fdb_init();
+       err = br_fdb_init();
+       if (err)
+               goto err_out;
+
+       err = register_pernet_subsys(&br_net_ops);
+       if (err)
+               goto err_out1;
+
+       err = br_netfilter_init();
+       if (err)
+               goto err_out2;
+
+       err = register_netdevice_notifier(&br_device_notifier);
+       if (err)
+               goto err_out3;
+
+       err = br_netlink_init();
+       if (err)
+               goto err_out4;
 
-#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;
 
-       register_netdevice_notifier(&br_device_notifier);
-
        return 0;
+err_out4:
+       unregister_netdevice_notifier(&br_device_notifier);
+err_out3:
+       br_netfilter_fini();
+err_out2:
+       unregister_pernet_subsys(&br_net_ops);
+err_out1:
+       br_fdb_fini();
+err_out:
+       stp_proto_unregister(&br_stp_proto);
+       return err;
 }
 
 static void __exit br_deinit(void)
 {
-       rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
+       stp_proto_unregister(&br_stp_proto);
 
-#ifdef CONFIG_BRIDGE_NETFILTER
-       br_netfilter_fini();
-#endif
+       br_netlink_fini();
        unregister_netdevice_notifier(&br_device_notifier);
        brioctl_set(NULL);
 
-       br_cleanup_bridges();
+       unregister_pernet_subsys(&br_net_ops);
 
        synchronize_net();
 
-       llc_sap_put(br_stp_sap);
+       br_netfilter_fini();
        br_fdb_get_hook = NULL;
        br_fdb_put_hook = NULL;