bridge: update sysfs link names if port device names have changed

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

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 573acdf..76357b5 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -28,13 +28,17 @@ static const struct stp_proto br_stp_proto = {
        .rcv    = br_stp_rcv,
 };
 
+static struct pernet_operations br_net_ops = {
+       .exit   = br_net_exit,
+};
+
 static int __init br_init(void)
 {
        int err;
 
        err = stp_proto_register(&br_stp_proto);
        if (err < 0) {
-               printk(KERN_ERR "bridge: can't register sap for STP\n");
+               pr_err("bridge: can't register sap for STP\n");
                return err;
        }
 
@@ -42,29 +46,36 @@ static int __init br_init(void)
        if (err)
                goto err_out;
 
-       err = br_netfilter_init();
+       err = register_pernet_subsys(&br_net_ops);
        if (err)
                goto err_out1;
 
-       err = register_netdevice_notifier(&br_device_notifier);
+       err = br_netfilter_init();
        if (err)
                goto err_out2;
 
-       err = br_netlink_init();
+       err = register_netdevice_notifier(&br_device_notifier);
        if (err)
                goto err_out3;
 
+       err = br_netlink_init();
+       if (err)
+               goto err_out4;
+
        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;
+#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+       br_fdb_test_addr_hook = br_fdb_test_addr;
+#endif
 
        return 0;
-err_out3:
+err_out4:
        unregister_netdevice_notifier(&br_device_notifier);
-err_out2:
+err_out3:
        br_netfilter_fini();
+err_out2:
+       unregister_pernet_subsys(&br_net_ops);
 err_out1:
        br_fdb_fini();
 err_out:
@@ -80,13 +91,14 @@ static void __exit br_deinit(void)
        unregister_netdevice_notifier(&br_device_notifier);
        brioctl_set(NULL);
 
-       br_cleanup_bridges();
+       unregister_pernet_subsys(&br_net_ops);
 
-       synchronize_net();
+       rcu_barrier(); /* Wait for completion of call_rcu()'s */
 
        br_netfilter_fini();
-       br_fdb_get_hook = NULL;
-       br_fdb_put_hook = NULL;
+#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+       br_fdb_test_addr_hook = NULL;
+#endif
 
        br_handle_frame_hook = NULL;
        br_fdb_fini();