aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-08-01 15:03:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-15 15:04:11 -0400
commit61e0a9e79d85258d254c5bfb7832c40ba2c46ed4 (patch)
tree3550a873d98076233f90dc30d73d830618905abd
parent8bda26e33846b53e2c70a2ccff13e3f5b69ab067 (diff)
mac80211: cancel mesh path timer
commit dd4c9260e7f23f2e951cbfb2726e468c6d30306c upstream. The mesh path timer needs to be canceled when leaving the mesh as otherwise it could fire after the interface has been removed already. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/mac80211/mesh.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 29e9980c8e6..370aa94ead1 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -490,6 +490,7 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
490 490
491 del_timer_sync(&sdata->u.mesh.housekeeping_timer); 491 del_timer_sync(&sdata->u.mesh.housekeeping_timer);
492 del_timer_sync(&sdata->u.mesh.mesh_path_root_timer); 492 del_timer_sync(&sdata->u.mesh.mesh_path_root_timer);
493 del_timer_sync(&sdata->u.mesh.mesh_path_timer);
493 /* 494 /*
494 * If the timer fired while we waited for it, it will have 495 * If the timer fired while we waited for it, it will have
495 * requeued the work. Now the work will be running again 496 * requeued the work. Now the work will be running again