From 25d67e43327ff714b7a4fceb52345a1e5a59e9b5 Mon Sep 17 00:00:00 2001
From: Jesper Dangaard Brouer <hawk@comx.dk>
Date: Fri, 26 Jun 2009 10:45:53 +0000
Subject: [PATCH] --- yaml --- r: 154499 b: refs/heads/master c:
 4a27096bbe2cad4c6e78802a0d9dfe0e598a1129 h: refs/heads/master i:   154497:
 9a4db833e3bf0ea0e1a659f9924ea126c60944e3   154495:
 2ed8e33278894b59baca61f3cad06d573d07810f v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mesh.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d7303e363d14..4873e1b83a9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75de874f5c35f679c6370fccc2bf4930e638ef3b
+refs/heads/master: 4a27096bbe2cad4c6e78802a0d9dfe0e598a1129
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
index fc712e60705d..11cf45bce38a 100644
--- a/trunk/net/mac80211/mesh.c
+++ b/trunk/net/mac80211/mesh.c
@@ -494,7 +494,7 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
 	 * should it be using the interface and enqueuing
 	 * frames at this very time on another CPU.
 	 */
-	synchronize_rcu();
+	rcu_barrier(); /* Wait for RX path and call_rcu()'s */
 	skb_queue_purge(&sdata->u.mesh.skb_queue);
 }