[commits] [openwrt-feed-devel] master: batman-adv-devel: Drop compat-hack for from_timer (6500b27)

postmaster at open-mesh.org postmaster at open-mesh.org
Sat Mar 9 13:02:45 CET 2019


Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch  : master

>---------------------------------------------------------------

commit 6500b27e1d4f0589a5dd206a80d615aa405e26a1
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Feb 22 20:19:42 2019 +0100

    batman-adv-devel: 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 at narfation.org>


>---------------------------------------------------------------

6500b27e1d4f0589a5dd206a80d615aa405e26a1
 batman-adv-devel/src/compat-hacks.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h
index 321ad6d..5733d69 100644
--- a/batman-adv-devel/src/compat-hacks.h
+++ b/batman-adv-devel/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)
 
 



More information about the commits mailing list