diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-08-01 21:03:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-15 12:04:11 -0700 |
| commit | 61e0a9e79d85258d254c5bfb7832c40ba2c46ed4 (patch) | |
| tree | 3550a873d98076233f90dc30d73d830618905abd /net | |
| parent | 8bda26e33846b53e2c70a2ccff13e3f5b69ab067 (diff) | |
| download | kernel_samsung_crespo-61e0a9e79d85258d254c5bfb7832c40ba2c46ed4.zip kernel_samsung_crespo-61e0a9e79d85258d254c5bfb7832c40ba2c46ed4.tar.gz kernel_samsung_crespo-61e0a9e79d85258d254c5bfb7832c40ba2c46ed4.tar.bz2 | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mesh.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 29e9980..370aa94 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) 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 |