@@ -257,7 +257,7 @@ void dm_check_ac_dc_power(struct net_device *dev)
if(priv->ieee80211->state != IEEE80211_LINKED) {
return;
}
- call_usermodehelper(ac_dc_check_script_path,argv,envp,1);
+ call_usermodehelper(ac_dc_check_script_path,argv,envp,UMH_WAIT_PROC);
}
void hal_dm_watchdog(struct net_device *dev)
@@ -222,11 +222,11 @@ static inline void do_ipw2100_loading(int state)
if (state == RADIO_ON) {
char *argv[] = { "/sbin/modprobe", "-s", "-k", "ipw2100", NULL };
mode = "loading";
- status = call_usermodehelper(argv[0], argv, envp, 1);
+ status = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
} else {
char *argv[] = { "/sbin/rmmod", "ipw2100", NULL };
mode = "removing";
- status = call_usermodehelper(argv[0], argv, envp, 1);
+ status = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
}
DEBUG_OUT2("%s of ipw2100 module %s\n", mode, status == 0 ? "successful" : "FAILED");
}
@@ -100,7 +100,7 @@ struct wrap_driver *load_wrap_driver(struct wrap_device *wd)
EXIT1(return NULL);
}
INIT_COMPLETION(loader_complete);
- ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, 1);
+ ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, UMH_WAIT_PROC);
if (ret) {
up(&loader_mutex);
ERROR("couldn't load driver %s; check system log "
@@ -262,7 +262,7 @@ struct wrap_bin_file *get_bin_file(char *bin_file_name)
EXIT1(return NULL);
}
INIT_COMPLETION(loader_complete);
- ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, 1);
+ ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, UMH_WAIT_PROC);
if (ret) {
up(&loader_mutex);
ERROR("couldn't load file %s/%s; check system log "
@@ -698,7 +698,7 @@ struct wrap_device *load_wrap_device(struct load_device *load_device)
EXIT1(return NULL);
}
INIT_COMPLETION(loader_complete);
- ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, 1);
+ ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, UMH_WAIT_PROC);
if (ret) {
up(&loader_mutex);
TRACE1("couldn't load device %04x:%04x; check system "
@@ -421,7 +421,7 @@ void dm_check_ac_dc_power(struct net_device *dev)
if(priv->rtllib->state != RTLLIB_LINKED) {
return;
}
- call_usermodehelper(ac_dc_check_script_path,argv,envp,1);
+ call_usermodehelper(ac_dc_check_script_path,argv,envp,UMH_WAIT_PROC);
return;
};
@@ -3611,7 +3611,7 @@ extern void dm_CheckRfCtrlGPIO(void *data)
argv[0] = RadioPowerPath;
argv[2] = NULL;
- call_usermodehelper(RadioPowerPath,argv,envp,1);
+ call_usermodehelper(RadioPowerPath,argv,envp,UMH_WAIT_PROC);
}
}
@@ -3996,7 +3996,7 @@ extern void dm_CheckRfCtrlGPIO(void *data)
argv[0] = RadioPowerPath;
argv[2] = NULL;
- call_usermodehelper(RadioPowerPath,argv,envp,1);
+ call_usermodehelper(RadioPowerPath,argv,envp,UMH_WAIT_PROC);
#endif
}
BugLink: http://bugs.launchpad.net/bugs/963685 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/staging/rtl8192e/r8192E_dm.c | 2 +- ubuntu/fsam7400/fsam7400.c | 4 ++-- ubuntu/ndiswrapper/loader.c | 6 +++--- ubuntu/rtl8192se/rtl_dm.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-)