diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-08-01 21:03:21 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-08-01 21:03:21 +0200 |
| commit | dd4c9260e7f23f2e951cbfb2726e468c6d30306c (patch) | |
| tree | 21995b63356cdcdc18ac3b4bf041fa9b9405d3b3 /net/mac80211 | |
| parent | 2d9957cce674308f744f37f68b6bc3261bfdbbf4 (diff) | |
| download | op-kernel-dev-dd4c9260e7f23f2e951cbfb2726e468c6d30306c.zip op-kernel-dev-dd4c9260e7f23f2e951cbfb2726e468c6d30306c.tar.gz | |
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 <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -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 d60b3d3..8557235 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 |
