---

yaml --- r: 90096 b: refs/heads/master c: 89a1ad6 h: refs/heads/master v: v3
git-mirror · Mar 6, 2008 · 8fb98eb · 8fb98eb
1 parent 89c98d1
commit 8fb98eb
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: aa2b5928433ce6ba98cf31ab048c7882aeae56a3
+refs/heads/master: 89a1ad6990d884796c5280d13aa58d216dffa08d
diff --git a/trunk/net/mac80211/mesh_pathtbl.c b/trunk/net/mac80211/mesh_pathtbl.c
@@ -301,6 +301,7 @@ static void mesh_path_node_reclaim(struct rcu_head *rp)
 	struct ieee80211_sub_if_data *sdata =
 		IEEE80211_DEV_TO_SUB_IF(node->mpath->dev);
 
+	del_timer_sync(&node->mpath->timer);
 	atomic_dec(&sdata->u.sta.mpaths);
 	kfree(node->mpath);
 	kfree(node);