From 71c003ba49a348ed322ee100ca5a058fd0bfab2d Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 2 Dec 2013 16:55:26 -0600 Subject: [PATCH] dahdi: Fix previous CentOS 6.5 commit. The previous commit from earlier today to fix the backport of PDE_DATA was wrong in that it would not then process the other defines for older kernels if it detected it was running on a redhat release. Signed-off-by: Shaun Ruffell --- include/dahdi/kernel.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index c404926..3f14727 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1404,18 +1404,18 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss) /*! Maximum audio mask */ #define DAHDI_FORMAT_AUDIO_MASK ((1 << 16) - 1) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) #ifdef RHEL_RELEASE_VERSION -# if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6, 5) -# ifdef CONFIG_PROC_FS +#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6, 5) +#ifdef CONFIG_PROC_FS #include static inline void *PDE_DATA(const struct inode *inode) { return PDE(inode)->data; } -# endif -# endif +#endif +#endif #else -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) #ifdef CONFIG_PROC_FS #include static inline void *PDE_DATA(const struct inode *inode)