This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / os-Linux / drivers / ethertap_user.c

diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index cd4d654..d4bb214 100644 (file)
--- 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");