diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2012-06-21 17:53:33 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2012-06-21 17:53:33 +0000 |
commit | 1cb2393ffac3e045cee45b2c64d288378e6be672 (patch) | |
tree | d0a4f7ef7ad8f15fe964a95bf5f5a00cc4b4a2ea | |
parent | 3c443b349d413e4093caf8af8c6e6f146fb427b0 (diff) |
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 <oron.peled@xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.6@10694 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/xpp/card_global.c | 12 |
1 files changed, 11 insertions, 1 deletions
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 */ |