From 9a4db833e3bf0ea0e1a659f9924ea126c60944e3 Mon Sep 17 00:00:00 2001 From: Jesper Dangaard Brouer Date: Fri, 26 Jun 2009 10:45:48 +0000 Subject: [PATCH] --- yaml --- r: 154497 b: refs/heads/master c: 473c22d759e73cbbe604f41105b497817cc2ee8e h: refs/heads/master i: 154495: 2ed8e33278894b59baca61f3cad06d573d07810f v: v3 --- [refs] | 2 +- trunk/net/bridge/br.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 377c1cc5ccf0..1730be57b9e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f2ccd00f224a4e2d6d26f590f3e6851f3deef99 +refs/heads/master: 473c22d759e73cbbe604f41105b497817cc2ee8e diff --git a/trunk/net/bridge/br.c b/trunk/net/bridge/br.c index 9aac5213105a..e1241c76239a 100644 --- a/trunk/net/bridge/br.c +++ b/trunk/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)