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

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  69fb09d011fd3ca746783891a19f10d900978ae1 (commit)
       via  da0aa6f231d39f6d12c97f16b439c65cb8d29254 (commit)
      from  a46f906a0da5ee05e50ab3fc38f65dd06d552a9e (commit)

Summary of changes:
 drivers/dahdi/dahdi-sysfs-chan.c |    1 +
 drivers/dahdi/xpp/xdefs.h        |   10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 69fb09d011fd3ca746783891a19f10d900978ae1
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Mon Jan 21 21:28:13 2013 -0600

    dahdi: Initialize the channels cdev structure.
    
    This is necessary to prevent a crash when opening files by the new
    device files, which do not have a valid file_operations structure.
    This fixes a problem does not exist in any releases of DAHDI.
    
    Since none of the existing tools or applications open files from the
    new location of /dev/dahdi/channels/<span>/<offset>, this wasn't
    seen until just recently.
    
    Reported-by: Ted Gerold <ted at twg.org>
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c
index 84bfef9..f6fe7de 100644
--- a/drivers/dahdi/dahdi-sysfs-chan.c
+++ b/drivers/dahdi/dahdi-sysfs-chan.c
@@ -463,6 +463,7 @@ int __init dahdi_sysfs_chan_init(const struct file_operations *fops)
 		goto cleanup;
 	}
 	dahdi_dbg(DEVICES, "adding channels cdev\n");
+	cdev_init(&dahdi_channels_cdev, fops);
 	res = cdev_add(&dahdi_channels_cdev, dahdi_channels_devt,
 		DAHDI_MAX_CHANNELS);
 	if (res) {

commit da0aa6f231d39f6d12c97f16b439c65cb8d29254
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Sat Jan 19 17:02:41 2013 -0600

    xpp: Do not typedef bool on RHEL 5.2 or later.
    
    Without digging into the specifics, it looks like Red Hat Linux 5.9
    removed the hex_asc definition that was previously used to determine
    if the bool definition was backported.
    
    We can simply use the RHEL_RELEASE_CODE now since we do not support any
    releases before the 5 series now.
    
    Reported-By: Vladimir Mikhelson
    Internal-Issue-ID: DAHLIN-312
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>
    Acked-By: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/xpp/xdefs.h b/drivers/dahdi/xpp/xdefs.h
index 054c30c..b15fa05 100644
--- a/drivers/dahdi/xpp/xdefs.h
+++ b/drivers/dahdi/xpp/xdefs.h
@@ -145,10 +145,12 @@ typedef char *charp;
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-/* Also don't define this for later RHEL >= 5.2 . hex_asc is from the
- * same linux-2.6-net-infrastructure-updates-to-mac80211-iwl4965.patch
- * as is the bool typedef. */
-#if LINUX_VERSION_CODE != KERNEL_VERSION(2, 6, 18)  || !defined(hex_asc)
+/* Also don't define this for later RHEL >= 5.2. */
+#if defined(RHEL_RELEASE_CODE) && defined(RHEL_RELEASE_VERSION)
+#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 3)
+typedef int bool;
+#endif
+#else
 typedef int bool;
 #endif
 #endif

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


-- 
dahdi/linux.git