diff options
| author | Kees Cook | 2017-10-17 01:35:49 +0200 |
|---|---|---|
| committer | Johannes Berg | 2017-11-20 16:55:11 +0100 |
| commit | 34f11cd329580fe4c3e8f10081d687331fc710f3 (patch) | |
| tree | e3918de464907d9776bb1a91d5da393027bc90a5 /net/mac80211/mesh_pathtbl.c | |
| parent | net: vxge: Fix some indentation issues (diff) | |
| download | kernel-qcow2-linux-34f11cd329580fe4c3e8f10081d687331fc710f3.tar.gz kernel-qcow2-linux-34f11cd329580fe4c3e8f10081d687331fc710f3.tar.xz kernel-qcow2-linux-34f11cd329580fe4c3e8f10081d687331fc710f3.zip | |
mac80211: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.
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: Kees Cook <keescook@chromium.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
| -rw-r--r-- | net/mac80211/mesh_pathtbl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 97269caafecd..86c8dfef56a4 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@ -399,8 +399,7 @@ struct mesh_path *mesh_path_new(struct ieee80211_sub_if_data *sdata, skb_queue_head_init(&new_mpath->frame_queue); new_mpath->exp_time = jiffies; spin_lock_init(&new_mpath->state_lock); - setup_timer(&new_mpath->timer, mesh_path_timer, - (unsigned long) new_mpath); + timer_setup(&new_mpath->timer, mesh_path_timer, 0); return new_mpath; } |