[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170309093436.25227-1-ondrej.lysonek@seznam.cz>
Date: Thu, 9 Mar 2017 10:34:36 +0100
From: ondrej.lysonek@...nam.cz
To: johannes@...solutions.net
Cc: Ondřej Lysoněk <ondrej.lysonek@...nam.cz>,
Jiri Slaby <jslaby@...e.cz>,
"David S. Miller" <davem@...emloft.net>,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: [PATCH] mac80211: Use setup_timer instead of init_timer
From: Ondřej Lysoněk <ondrej.lysonek@...nam.cz>
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 <ondrej.lysonek@...nam.cz>
Cc: Jiri Slaby <jslaby@...e.cz>
Cc: Johannes Berg <johannes@...solutions.net>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: <linux-wireless@...r.kernel.org>
Cc: <netdev@...r.kernel.org>
---
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
Powered by blists - more mailing lists