[dahdi-commits] dahdi/linux.git branch "2.7.y" created.

[SVN commits to the DAHDI project]

branch "2.7.y" has been created
        at  c1d867b8b751cd2a68575ce35d32e78fdf113933 (commit)

- Log -----------------------------------------------------------------
commit c1d867b8b751cd2a68575ce35d32e78fdf113933
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Mon Dec 2 16:55:26 2013 -0600

    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 <sruffell at digium.com>
    (cherry picked from commit 71c003ba49a348ed322ee100ca5a058fd0bfab2d)

diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 073669b..2f4cd0d 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1401,18 +1401,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 <linux/proc_fs.h>
 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 <linux/proc_fs.h>
 static inline void *PDE_DATA(const struct inode *inode)

commit 1ff5629078812fa957142f7c95d6898f4e56d062
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Sun Dec 1 19:57:44 2013 -0600

    dahdi: CentOS 6.5 backported PDE_DATA definition.
    
    This will fix the "error: redefinition of 'PDE_DATA'" error when compiling.
    
    Internal-Issue-ID: DAHLIN-330
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>
    (cherry picked from commit 5ec9d756aac1a0eb5c1f48eb110e80946b43f41a)

diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 8f3dc76..073669b 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1401,6 +1401,17 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss)
 /*! Maximum audio mask */
 #define DAHDI_FORMAT_AUDIO_MASK	((1 << 16) - 1)
 
+#ifdef RHEL_RELEASE_VERSION
+#    if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6, 5)
+#        ifdef CONFIG_PROC_FS
+#include <linux/proc_fs.h>
+static inline void *PDE_DATA(const struct inode *inode)
+{
+	return PDE(inode)->data;
+}
+#        endif
+#   endif
+#else
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
@@ -1409,6 +1420,7 @@ static inline void *PDE_DATA(const struct inode *inode)
 	return PDE(inode)->data;
 }
 #endif
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
 #define KERN_CONT ""
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)

-----------------------------------------------------------------------


-- 
dahdi/linux.git