diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-16 16:35:49 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-11-20 16:55:11 +0100 |
| commit | 34f11cd329580fe4c3e8f10081d687331fc710f3 (patch) | |
| tree | e3918de464907d9776bb1a91d5da393027bc90a5 /net/mac80211/main.c | |
| parent | 32a72bbd5da2411eab591bf9bc2e39349106193a (diff) | |
| download | linux-stable-34f11cd329580fe4c3e8f10081d687331fc710f3.tar.gz linux-stable-34f11cd329580fe4c3e8f10081d687331fc710f3.tar.bz2 linux-stable-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/main.c')
| -rw-r--r-- | net/mac80211/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 8aa1f5b6a051..e054a2fd8d38 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -633,8 +633,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, ieee80211_dynamic_ps_enable_work); INIT_WORK(&local->dynamic_ps_disable_work, ieee80211_dynamic_ps_disable_work); - setup_timer(&local->dynamic_ps_timer, - ieee80211_dynamic_ps_timer, (unsigned long) local); + timer_setup(&local->dynamic_ps_timer, ieee80211_dynamic_ps_timer, 0); INIT_WORK(&local->sched_scan_stopped_work, ieee80211_sched_scan_stopped_work); |