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 9aac521..76357b5 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -38,7 +38,7 @@ static int __init br_init(void)
 
        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;
        }
 
@@ -93,7 +93,7 @@ static void __exit br_deinit(void)
 
        unregister_pernet_subsys(&br_net_ops);
 
-       synchronize_net();
+       rcu_barrier(); /* Wait for completion of call_rcu()'s */
 
        br_netfilter_fini();
 #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)