[PATCH] mac80211: Use setup_timer instead of init_timer
From: <hidden>
Date: 2017-03-09 09:34:36
Also in:
netdev
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2017-03-16 · Re: [PATCH] mac80211: Use setup_timer instead of init_timer · Johannes Berg <hidden>
- 2017-03-06 · Re: [PATCH] mac80211: Use setup_timer instead of init_timer · Johannes Berg <johannes@sipsolutions.net>
- 2017-03-06 · Re: [PATCH] mac80211: Use setup_timer instead of init_timer · Johannes Berg <johannes@sipsolutions.net>
- 2017-03-06 · Re: [PATCH] mac80211: Use setup_timer instead of init_timer · Johannes Berg <johannes@sipsolutions.net>
- 2017-03-06 · Re: [PATCH] mac80211: Use setup_timer instead of init_timer · Johannes Berg <johannes@sipsolutions.net>
From: Ondřej Lysoněk <redacted> 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: Ondřej Lysoněk <redacted> Cc: Jiri Slaby <redacted> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: <redacted> Cc: <redacted> --- net/mac80211/mesh_pathtbl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index f0e6175..64c6174 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c@@ -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; }
--
2.9.3