Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 9aac5213105aaf031e5ca1fcc993a051800e1475..e1241c76239a96fb3e4d027ba071b640c2904ceb 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -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)