FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpp: usermode_helper() bugfix for kernels >= 3.3.0

Browse Source 
* 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@xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10692 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Oron Peled 2012-06-21 17:34:09 +00:00 committed by Tzafrir Cohen
parent c73656edc5
commit 76ce8d5951
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/dahdi/xpp/card_global.c
View File

@ -22,6 +22,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kmod.h>
#include "xdefs.h" #include "xdefs.h"
#include "xpd.h" #include "xpd.h"
#include "xpp_dahdi.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 #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 run_initialize_registers(xpd_t *xpd)
{ {
int ret; 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", XPD_DBG(DEVICES, xpd, "running '%s' for type=%d revision=%d\n",
init_card, xpd->type, xbus->revision); 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 * Carefully report results
*/ */