File dahdi-fix-leap-15.1.diff of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File dahdi-fix-leap-15.1.diff of Package dahdi-linux

Index: b/include/dahdi/kernel.h
===================================================================
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1376,41 +1376,10 @@ static inline short dahdi_txtone_nextsam
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
 
-#ifndef TIMER_DATA_TYPE
-#define TIMER_DATA_TYPE unsigned long
-#endif
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
 
-#ifdef RHEL_RELEASE_VERSION
-#if RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7, 5)
-#define DAHDI_HAVE_TIMER_SETUP
 #undef TIMER_DATA_TYPE
 #define TIMER_DATA_TYPE struct timer_list *
-#endif
-#endif
-
-#ifndef DAHDI_HAVE_TIMER_SETUP
-/**
- * timer_setup - Added in 4.13.0.  We can make a direct translation to the
- * setup_timer interface since DAHDI does not pass any flags to any of the
- * timer_setup functions.
- *
- */
-static inline void
-timer_setup(struct timer_list *timer,
-	    void (*timer_callback)(TIMER_DATA_TYPE data),
-	    unsigned long flags)
-{
-	WARN_ON(flags != 0);
-	setup_timer(timer, timer_callback, (TIMER_DATA_TYPE)timer);
-}
-
-#define from_timer(var, callback_timer, timer_fieldname) \
-	container_of((struct timer_list *)(callback_timer), \
-		     typeof(*var), timer_fieldname)
-
-#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
 #define refcount_read atomic_read

Places

File dahdi-fix-leap-15.1.diff of Package dahdi-linux

Places