diff --git a/[refs] b/[refs]
index ace04f596654..bb67ec78e895 100644
--- 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
index d60b3d362e00..85572353a7e3 100644
--- 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