Commit d0df9eec authored May 13, 2011 by Javier Cardona Committed by John W. Linville May 16, 2011

mac80211: Deactivate mesh path timers when freeing nodes



Mesh paths are deleted via mesh_path_del() which properly
deactivates the timer associated to a mesh path.  But if paths were
deleted by mesh_table_free(..., true) timers would not be deactivated.
This fixes this case.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 011159a0

net/mac80211/mesh_pathtbl.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -719,8 +719,10 @@ static void mesh_path_node_free(struct hlist_node *p, bool free_leafs)
		struct mpath_node *node = hlist_entry(p, struct mpath_node, list);
		mpath = node->mpath;
		hlist_del_rcu(p);
		if (free_leafs)
		if (free_leafs) {
		del_timer_sync(&mpath->timer);
		kfree(mpath);
		}
		kfree(node);
		}