[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  acfec5dfbbf83bff320cefcafa6e392b8650fe5d (commit)
       via  5ec9d756aac1a0eb5c1f48eb110e80946b43f41a (commit)
      from  4bfdd8bea5f2f7b85a9cce3818e4d59fc7bde263 (commit)

Summary of changes:
 drivers/dahdi/wcxb.c   |    4 ++++
 include/dahdi/kernel.h |   12 ++++++++++++
 2 files changed, 16 insertions(+)


- Log -----------------------------------------------------------------
commit acfec5dfbbf83bff320cefcafa6e392b8650fe5d
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Sat Nov 30 17:05:12 2013 -0600

    wcxb: is_pcie -> pci_is_pcie()
    
    is_pcie attribute was finally dropped from struct pci_dev in
    upstream commit 115e3bc5e23e7ec3c85a2014bfa96c0ddd036083.
    
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

diff --git a/drivers/dahdi/wcxb.c b/drivers/dahdi/wcxb.c
index 6266523..a418447 100644
--- a/drivers/dahdi/wcxb.c
+++ b/drivers/dahdi/wcxb.c
@@ -122,11 +122,15 @@ struct wcxb_meta_desc {
 
 static inline bool wcxb_is_pcie(const struct wcxb *xb)
 {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 33)
+	return pci_is_pcie(xb->pdev);
+#else
 #ifndef WCXB_PCI_DEV_DOES_NOT_HAVE_IS_PCIE
 	return (xb->pdev->is_pcie > 0);
 #else
 	return (xb->flags.is_pcie > 0);
 #endif
+#endif
 }
 
 static const unsigned int CLK_SRC_MASK = ((1 << 13) | (1 << 12) | (1 << 1));

commit 5ec9d756aac1a0eb5c1f48eb110e80946b43f41a
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>

diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index d13e60b..c404926 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1404,6 +1404,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>
@@ -1412,6 +1423,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, 27)

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


-- 
dahdi/linux.git