lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: fix mpath timer NULL function

Browse Source 
If we have an mpath whose timer has not been initialized, don't try to
delete it.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Javier Cardona
2011-08-09 16:45:05 -07:00
committed by John W. Linville
parent 7646887a53
commit 86d7f9f35d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/mesh_pathtbl.c
View File

@@ -619,7 +619,8 @@ static void mesh_path_node_reclaim(struct rcu_head *rp)
struct mpath_node *node = container_of(rp, struct mpath_node, rcu); struct mpath_node *node = container_of(rp, struct mpath_node, rcu);
struct ieee80211_sub_if_data *sdata = node->mpath->sdata; struct ieee80211_sub_if_data *sdata = node->mpath->sdata;
del_timer_sync(&node->mpath->timer); if (node->mpath->timer.function)
del_timer_sync(&node->mpath->timer);
atomic_dec(&sdata->u.mesh.mpaths); atomic_dec(&sdata->u.mesh.mpaths);
kfree(node->mpath); kfree(node->mpath);
kfree(node); kfree(node);
@@ -768,7 +769,8 @@ static void mesh_path_node_free(struct hlist_node *p, bool free_leafs)
mpath = node->mpath; mpath = node->mpath;
hlist_del_rcu(p); hlist_del_rcu(p);
if (free_leafs) { if (free_leafs) {
del_timer_sync(&mpath->timer); if (mpath->timer.function)
del_timer_sync(&mpath->timer);
kfree(mpath); kfree(mpath);
} }
kfree(node); kfree(node);