From: Johannes Berg Date: Wed, 1 Aug 2012 19:03:21 +0000 (+0200) Subject: mac80211: cancel mesh path timer X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=dd4c9260e7f23f2e951cbfb2726e468c6d30306c;p=~shefty%2Frdma-dev.git mac80211: cancel mesh path timer The mesh path timer needs to be canceled when leaving the mesh as otherwise it could fire after the interface has been removed already. Cc: stable@vger.kernel.org Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index d60b3d362e0..85572353a7e 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -622,6 +622,7 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) del_timer_sync(&sdata->u.mesh.housekeeping_timer); del_timer_sync(&sdata->u.mesh.mesh_path_root_timer); + del_timer_sync(&sdata->u.mesh.mesh_path_timer); /* * If the timer fired while we waited for it, it will have * requeued the work. Now the work will be running again