summaryrefslogtreecommitdiff
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-06-11 11:25:50 +0200
committerIngo Molnar <mingo@kernel.org>2016-06-11 11:25:50 +0200
commit50c0587eedc15235144216f2d2a5bd2a85e03289 (patch)
tree74f24e52bba71efea51dc8ada3ac5427aa1627e5 /net/mac80211/mesh.c
parent3b290398638ee4e57f1fb2e35c02005cba9a737f (diff)
parent75d089d12a66a8662d888ff60a9eaea230fed53e (diff)
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 4c6404e1ad6e..21b1fdf5d01d 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -161,6 +161,10 @@ void mesh_sta_cleanup(struct sta_info *sta)
del_timer_sync(&sta->mesh->plink_timer);
}
+ /* make sure no readers can access nexthop sta from here on */
+ mesh_path_flush_by_nexthop(sta);
+ synchronize_net();
+
if (changed)
ieee80211_mbss_info_change_notify(sdata, changed);
}