[Pkg-voip-commits] r10087 - in /dahdi-linux/trunk/debian: changelog patches/fix_xpp_usermode patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Tue Jan 29 21:31:13 2013
New Revision: 10087

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10087
Log:
Patch fix_xpp_usermode: fixes odd xpp behaviour with later kernels.

Added:
    dahdi-linux/trunk/debian/patches/fix_xpp_usermode
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=10087&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Tue Jan 29 21:31:13 2013
@@ -3,6 +3,7 @@
   * Patch fix_define_dev: fix building with kernel 3.8.
   * Remove non-free FPGA bitfiles and patch drivers to load them
     (Closes: #693666) (Ben Hutchings).
+  * Patch fix_xpp_usermode: fixes odd xpp behaviour with later kernels.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 28 Jan 2013 14:23:01 +0200
 

Added: dahdi-linux/trunk/debian/patches/fix_xpp_usermode
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/fix_xpp_usermode?rev=10087&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/fix_xpp_usermode (added)
+++ dahdi-linux/trunk/debian/patches/fix_xpp_usermode Tue Jan 29 21:31:13 2013
@@ -1,0 +1,60 @@
+From c0eebd73bb29f1187b38cc3a41f1a86579e481ac Mon Sep 17 00:00:00 2001
+From: Oron Peled <oron.peled at xorcom.com>
+Date: Thu, 21 Jun 2012 17:53:33 +0000
+Subject: xpp: usermode_helper() bugfix for kernels >= 3.3.0
+Origin: http://git.asterisk.org/gitweb/?p=dahdi/linux.git;a=commit;h=c0eebd73bb29f1187b38cc3a41f1a86579e481ac
+
+Respective kernels fail to run the initialization script but report it
+was run, and thus the device behaves in an odd way.
+
+* UMH_WAIT_PROC semantics (and value) was changed from enum to
+  a bitmask (via #define)
+* This constant was missing from kernels older than 2.6.23
+
+Signed-off-by: Oron Peled <oron.peled at xorcom.com>
+Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+
+---
+ drivers/dahdi/xpp/card_global.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c
+index 29c43f0..dca5aee 100644
+--- a/drivers/dahdi/xpp/card_global.c
++++ b/drivers/dahdi/xpp/card_global.c
+@@ -22,6 +22,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/delay.h>
++#include <linux/kmod.h>
+ #include "xdefs.h"
+ #include "xpd.h"
+ #include "xpp_dahdi.h"
+@@ -655,6 +656,15 @@ static void global_packet_dump(const char *msg, xpacket_t *pack)
+ 
+ #define	MAX_PATH_STR	128
+ 
++#ifndef	UMH_WAIT_PROC
++/*
++ * - UMH_WAIT_PROC was introduced as enum in 2.6.23
++ *   with a value of 1
++ * - It was changed to a macro (and it's value was modified) in 3.3.0
++ */
++#define	UMH_WAIT_PROC	1
++#endif
++
+ int run_initialize_registers(xpd_t *xpd)
+ {
+ 	int	ret;
+@@ -737,7 +747,7 @@ int run_initialize_registers(xpd_t *xpd)
+ 	}
+ 	XPD_DBG(DEVICES, xpd, "running '%s' for type=%d revision=%d\n",
+ 			init_card, xpd->type, xbus->revision);
+-	ret = call_usermodehelper(init_card, argv, envp, 1);
++	ret = call_usermodehelper(init_card, argv, envp, UMH_WAIT_PROC);
+ 	/*
+ 	 * Carefully report results
+ 	 */
+-- 
+1.7.10.4
+

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=10087&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Tue Jan 29 21:31:13 2013
@@ -6,3 +6,4 @@
 fix_define_dev
 tor2-request_firmware
 pciradio-request_firmware
+fix_xpp_usermode