From 446eed8b9a7666d67bcbe5daf3cc5993408bc305 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 4 Mar 2018 23:57:06 +0100 Subject: patches: Use old parameter type for DEFINE_TIMER Use the unsigned long parameters on kernel versions < 4.15 for the DEFINE_TIMER callback. This was changed in Linux mainline commit 24ed960abf1d ("treewide: Switch DEFINE_TIMER callbacks to struct timer_list *") Signed-off-by: Hauke Mehrtens Signed-off-by: Johannes Berg --- patches/0083-timer_list.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/0083-timer_list.patch (limited to 'patches') diff --git a/patches/0083-timer_list.patch b/patches/0083-timer_list.patch new file mode 100644 index 00000000..dca3b948 --- /dev/null +++ b/patches/0083-timer_list.patch @@ -0,0 +1,22 @@ +--- a/drivers/net/wireless/atmel/at76c50x-usb.c ++++ b/drivers/net/wireless/atmel/at76c50x-usb.c +@@ -518,11 +518,19 @@ exit: + + /* LED trigger */ + static int tx_activity; ++#if LINUX_VERSION_IS_LESS(4,15,0) ++static void at76_ledtrig_tx_timerfunc(unsigned long data); ++#else + static void at76_ledtrig_tx_timerfunc(struct timer_list *unused); ++#endif + static DEFINE_TIMER(ledtrig_tx_timer, at76_ledtrig_tx_timerfunc); + DEFINE_LED_TRIGGER(ledtrig_tx); + ++#if LINUX_VERSION_IS_LESS(4,15,0) ++static void at76_ledtrig_tx_timerfunc(unsigned long data) ++#else + static void at76_ledtrig_tx_timerfunc(struct timer_list *unused) ++#endif + { + static int tx_lastactivity; + -- cgit v1.2.3