From 76ce8d595158d1704a6db80e7a3035ccf56fd14c Mon Sep 17 00:00:00 2001 From: Oron Peled Date: Thu, 21 Jun 2012 17:34:09 +0000 Subject: [PATCH] xpp: usermode_helper() bugfix for kernels >= 3.3.0 * 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 Acked-by: Tzafrir Cohen git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10692 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- 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 b1e1a38..997ba63 100644 --- a/drivers/dahdi/xpp/card_global.c +++ b/drivers/dahdi/xpp/card_global.c @@ -22,6 +22,7 @@ #include #include +#include #include "xdefs.h" #include "xpd.h" #include "xpp_dahdi.h" @@ -674,6 +675,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; @@ -764,7 +774,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 */