Patchwork [Lucid,10/10] UBUNTU: SAUCE: ubuntu drivers: use UMH_WAIT_PROC consistently

login
register
mail settings
Submitter Tim Gardner
Date March 26, 2012, 6:01 p.m.
Message ID <1332784903-75063-11-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/148791/
State New
Headers show

Comments

Tim Gardner - March 26, 2012, 6:01 p.m.
BugLink: http://bugs.launchpad.net/bugs/963685

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 ubuntu/fsam7400/fsam7400.c  |    4 ++--
 ubuntu/ndiswrapper/loader.c |    6 +++---
 ubuntu/rtl8192se/rtl_dm.c   |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
Andy Whitcroft - March 27, 2012, 11:16 a.m.
On Mon, Mar 26, 2012 at 12:01:43PM -0600, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/963685
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  ubuntu/fsam7400/fsam7400.c  |    4 ++--
>  ubuntu/ndiswrapper/loader.c |    6 +++---
>  ubuntu/rtl8192se/rtl_dm.c   |    6 +++---

Will this also appear in LBM?  We should probally check at least in
compat wireless?  There maybe a compat shim for the difference between
the meanings of the last parameter for the 3.2/3.3 backports which we do
not need if we have the updated usermodehelper stuff.

-apw
Andy Whitcroft - March 27, 2012, 11:23 a.m.
On Tue, Mar 27, 2012 at 12:16:47PM +0100, Andy Whitcroft wrote:
> On Mon, Mar 26, 2012 at 12:01:43PM -0600, Tim Gardner wrote:
> > BugLink: http://bugs.launchpad.net/bugs/963685
> > 
> > Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> > ---
> >  ubuntu/fsam7400/fsam7400.c  |    4 ++--
> >  ubuntu/ndiswrapper/loader.c |    6 +++---
> >  ubuntu/rtl8192se/rtl_dm.c   |    6 +++---
> 
> Will this also appear in LBM?  We should probally check at least in
> compat wireless?  There maybe a compat shim for the difference between
> the meanings of the last parameter for the 3.2/3.3 backports which we do
> not need if we have the updated usermodehelper stuff.

Did a quick review of Lucid, Oneiric and Precise and cannot see any
calls to the interfaces which appear to be changing.  They all seem to
use request_module().  Be good if someone could sanity check my check
(as it were).

-apw

Patch

diff --git a/ubuntu/fsam7400/fsam7400.c b/ubuntu/fsam7400/fsam7400.c
index cbc40b8..c08e638 100644
--- a/ubuntu/fsam7400/fsam7400.c
+++ b/ubuntu/fsam7400/fsam7400.c
@@ -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");
 }
diff --git a/ubuntu/ndiswrapper/loader.c b/ubuntu/ndiswrapper/loader.c
index e1be090..71e15d9 100644
--- a/ubuntu/ndiswrapper/loader.c
+++ b/ubuntu/ndiswrapper/loader.c
@@ -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 "
diff --git a/ubuntu/rtl8192se/rtl_dm.c b/ubuntu/rtl8192se/rtl_dm.c
index c0a8ef8..e5cf004 100755
--- a/ubuntu/rtl8192se/rtl_dm.c
+++ b/ubuntu/rtl8192se/rtl_dm.c
@@ -427,7 +427,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;
 };
@@ -3612,7 +3612,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);
 			}
 
 		}
@@ -3997,7 +3997,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			
 		}