aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorLuis Carlos Cobo <luisca@cozybit.com>2008-02-29 17:49:37 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-03-06 16:40:51 -0500
commit89a1ad6990d884796c5280d13aa58d216dffa08d (patch)
tree5308faa7a6d27263070a616d62942e105159a6c3 /net/mac80211
parentaa2b5928433ce6ba98cf31ab048c7882aeae56a3 (diff)
mac80211: delete mesh_path timer on mesh_path removal
This avoids dereferencing a no longer existing struct mesh_path. Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh_pathtbl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index ab4d757c453b..bd58849f9dfb 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -301,6 +301,7 @@ static void mesh_path_node_reclaim(struct rcu_head *rp)
301 struct ieee80211_sub_if_data *sdata = 301 struct ieee80211_sub_if_data *sdata =
302 IEEE80211_DEV_TO_SUB_IF(node->mpath->dev); 302 IEEE80211_DEV_TO_SUB_IF(node->mpath->dev);
303 303
304 del_timer_sync(&node->mpath->timer);
304 atomic_dec(&sdata->u.sta.mpaths); 305 atomic_dec(&sdata->u.sta.mpaths);
305 kfree(node->mpath); 306 kfree(node->mpath);
306 kfree(node); 307 kfree(node);