summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/intel/iwlegacy/common.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 12:28:45 +0300
committerKalle Valo <kvalo@codeaurora.org>2017-10-27 10:44:48 +0300
commit2b77839b37345693c565c835179c5f6f50a0ed77 (patch)
treef471b7f89fc84127cd196aa60f42138b4a8411eb /drivers/net/wireless/intel/iwlegacy/common.h
parent7e916cafb4d97227713497723a200be41fe1a4b2 (diff)
downloadlinux-2b77839b37345693c565c835179c5f6f50a0ed77.tar.xz
iwlegacy: 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: Kalle Valo <kvalo@codeaurora.org> Cc: Stanislaw Gruszka <sgruszka@redhat.com> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlegacy/common.h')
-rw-r--r--drivers/net/wireless/intel/iwlegacy/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlegacy/common.h b/drivers/net/wireless/intel/iwlegacy/common.h
index 18c60c92e3a3..dc6a74a05983 100644
--- a/drivers/net/wireless/intel/iwlegacy/common.h
+++ b/drivers/net/wireless/intel/iwlegacy/common.h
@@ -1832,7 +1832,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd);
* PCI *
*****************************************************/
-void il_bg_watchdog(unsigned long data);
+void il_bg_watchdog(struct timer_list *t);
u32 il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval);
__le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon,
u32 beacon_interval);