X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fos-Linux%2Fdrivers%2Fethertap_user.c;h=d4bb2146798af585a271963991ec01890214b9da;hb=28169de0a7d33c5a792a8a4be7f519c637099cea;hp=cd4d6544da715eef01010a61ea46ff127651f9af;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index cd4d6544d..d4bb21467 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -16,7 +16,6 @@
 #include <net/if.h>
 #include "user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "net_user.h"
 #include "etap.h"
 #include "helper.h"
@@ -126,8 +125,7 @@ static int etap_tramp(char *dev, char *gate, int control_me,
 	if(c != 1){
 		printk("etap_tramp : uml_net failed\n");
 		err = -EINVAL;
-		CATCH_EINTR(n = waitpid(pid, &status, 0));
-		if(n < 0)
+		if(waitpid(pid, &status, 0) < 0)
 			err = -errno;
 		else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 1))
 			printk("uml_net didn't exit with status 1\n");