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); }