---

yaml --- r: 321465 b: refs/heads/master c: dd4c926 h: refs/heads/master i: 321463: 36b10f7 v: v3
git-mirror · Aug 1, 2012 · 86e20a7 · 86e20a7
1 parent 4313bca
commit 86e20a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d9957cce674308f744f37f68b6bc3261bfdbbf4
+refs/heads/master: dd4c9260e7f23f2e951cbfb2726e468c6d30306c
diff --git a/trunk/net/mac80211/mesh.c b/trunk/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