From: Hauke Mehrtens Date: Sun, 4 Mar 2018 22:57:05 +0000 (+0100) Subject: compat: timer.h: Remove last parameters from DEFINE_TIMER X-Git-Url: http://git.openwrt.org/openwrt/feeds.git?a=commitdiff_plain;h=88935359564216a49657078bcab83659b9059478;p=openwrt%2Fstaging%2Fblogic.git compat: timer.h: Remove last parameters from DEFINE_TIMER DEFINE_TIMER only has 2 parameters since kernel commit 1d27e3e2252ba ("timer: Remove expires and data arguments from DEFINE_TIMER") which was added with kernel 4.15. Add a version which translates between the new and the old API. Signed-off-by: Hauke Mehrtens Signed-off-by: Johannes Berg --- diff --git a/backport/backport-include/linux/timer.h b/backport/backport-include/linux/timer.h index 9824ea6bd889..69590bb71324 100644 --- a/backport/backport-include/linux/timer.h +++ b/backport/backport-include/linux/timer.h @@ -60,4 +60,11 @@ static inline void timer_setup(struct timer_list *timer, container_of(callback_timer, typeof(*var), timer_fieldname) #endif +#if LINUX_VERSION_IS_LESS(4,15,0) +#undef DEFINE_TIMER +#define DEFINE_TIMER(_name, _function) \ + struct timer_list _name = \ + __TIMER_INITIALIZER(_function, 0, 0, 0) +#endif + #endif /* _BACKPORT_TIMER_H */