Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c19dfbe authored by Ondřej Lysoněk's avatar Ondřej Lysoněk Committed by Johannes Berg
Browse files

mac80211: Use setup_timer instead of init_timer for mesh path 



Use setup_timer() and setup_deferrable_timer() to set the data and
function timer fields. It makes the code cleaner and will allow for
easier change of the timer struct internals.

Signed-off-by: default avatarOndřej Lysoněk <ondrej.lysonek@seznam.cz>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <linux-wireless@vger.kernel.org>
Cc: <netdev@vger.kernel.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e8e4f528

net/mac80211/mesh_pathtbl.c

+2 −3
Original line number Diff line number Diff line
@@ -397,11 +397,10 @@ struct mesh_path *mesh_path_new(struct ieee80211_sub_if_data *sdata, 
	new_mpath->sdata = sdata;

	new_mpath->flags = 0;

	skb_queue_head_init(&new_mpath->frame_queue);

	new_mpath->timer.data = (unsigned long) new_mpath;

	new_mpath->timer.function = mesh_path_timer;

	new_mpath->exp_time = jiffies;

	spin_lock_init(&new_mpath->state_lock);

	init_timer(&new_mpath->timer);

	setup_timer(&new_mpath->timer, mesh_path_timer,

		    (unsigned long) new_mpath);



	return new_mpath;

}