| From dd4c9260e7f23f2e951cbfb2726e468c6d30306c Mon Sep 17 00:00:00 2001 |
| From: Johannes Berg <johannes.berg@intel.com> |
| Date: Wed, 1 Aug 2012 21:03:21 +0200 |
| Subject: mac80211: cancel mesh path timer |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| 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> |
| |
| --- |
| net/mac80211/mesh.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/net/mac80211/mesh.c |
| +++ b/net/mac80211/mesh.c |
| @@ -621,6 +621,7 @@ void ieee80211_stop_mesh(struct ieee8021 |
| |
| 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 |
