summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2016-07-06 16:25:55 +0200
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2016-07-06 16:25:55 +0200
commitea1a25c3348abc33d7d94db28501766adf3d1c7d (patch)
treeca3c5c8b72532117034dd2d57a2a85eead13db7b /net/mac80211/mesh.c
parentSCSI: fix new bug in scsi_dev_info_list string matching (diff)
parentqla2xxx: Fix NULL pointer deref in QLA interrupt (diff)
downloadlinux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.tar.xz
linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.zip
Merge branch 'jejb-fixes' into fixes
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);
}