summaryrefslogtreecommitdiff
path: root/batman-adv/src
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2019-02-22 20:19:42 +0100
committerSven Eckelmann <sven@narfation.org>2019-02-22 20:37:54 +0100
commitdf9d2719fa6ab0fd37c4396d6cc593d488eea546 (patch)
treeefe8603471b888427b1c82d7803b67ca8723203c /batman-adv/src
parentae9c14e8b0af5df9fee0dcd84063c588b9e37bf9 (diff)
batman-adv: Drop compat-hack for from_timer
from_timer is already defined by the mac80211's backports and doesn't have to be redefined in the compat-hacks.h. Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'batman-adv/src')
-rw-r--r--batman-adv/src/compat-hacks.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h
index 321ad6d..5733d69 100644
--- a/batman-adv/src/compat-hacks.h
+++ b/batman-adv/src/compat-hacks.h
@@ -146,24 +146,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev,
#endif /* < KERNEL_VERSION(4, 15, 0) */
-#ifndef from_timer
-
-#define TIMER_DATA_TYPE unsigned long
-#define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE)
-
-static inline void timer_setup(struct timer_list *timer,
- void (*callback)(struct timer_list *),
- unsigned int flags)
-{
- __setup_timer(timer, (TIMER_FUNC_TYPE)callback,
- (TIMER_DATA_TYPE)timer, flags);
-}
-
-#define from_timer(var, callback_timer, timer_fieldname) \
- container_of(callback_timer, typeof(*var), timer_fieldname)
-
-#endif /* !from_timer */
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)