diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-04 23:57:06 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-03-21 09:19:32 +0100 |
| commit | 446eed8b9a7666d67bcbe5daf3cc5993408bc305 (patch) | |
| tree | 2fd9755732f2ae2f50b53216dedf0b7039a3b658 | |
| parent | 88935359564216a49657078bcab83659b9059478 (diff) | |
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 <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | patches/0083-timer_list.patch | 22 |
1 files changed, 22 insertions, 0 deletions
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; + |