diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-08-24 14:02:14 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-08-24 14:02:14 -0400 |
| commit | aeba4560ec6028761133e7ca635fec3a697498bd (patch) | |
| tree | e4e025c0c9757bff9a16bfc2bc65c6abd59866bf /net/mac80211 | |
| parent | 276c90df1ccfdd7ed0fbdaa03a7a3ba4c5404875 (diff) | |
| parent | c74a5e1fe4d0672936c8fb63d7484dfeaa30669c (diff) | |
Merge tag 'v3.2.28' into v3.2-rt
Linux 3.2.28
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 a7078fdba8ca..f85de8ed5859 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -543,6 +543,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 |