Merge branch 'smsc47b397-new-id' into release

[linux-2.6-omap-h63xx.git] / arch / um / drivers / slip_user.c

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index d78f324e72987f8e309f1d6a53c65452ca05de58..8b80505a3fb0117ed35676de600cce0b11b2f721 100644 (file)
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -77,7 +77,7 @@ static int slip_tramp(char **argv, int fd)
 {
        struct slip_pre_exec_data pe_data;
        char *output;
-       int status, pid, fds[2], err, output_len;
+       int pid, fds[2], err, output_len;
 
        err = os_pipe(fds, 1, 0);
        if (err < 0) {
@@ -109,15 +109,7 @@ static int slip_tramp(char **argv, int fd)
        read_output(fds[0], output, output_len);
        printk("%s", output);
 
-       CATCH_EINTR(err = waitpid(pid, &status, 0));
-       if (err < 0)
-               err = errno;
-       else if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
-               printk(UM_KERN_ERR "'%s' didn't exit with status 0\n", argv[0]);
-               err = -EINVAL;
-       }
-       else err = 0;
-
+       err = helper_wait(pid);
        close(fds[0]);
 
 out_free:
@@ -230,11 +222,6 @@ int slip_user_write(int fd, void *buf, int len, struct slip_data *pri)
        return slip_proto_write(fd, buf, len, &pri->slip);
 }
 
-static int slip_set_mtu(int mtu, void *data)
-{
-       return mtu;
-}
-
 static void slip_add_addr(unsigned char *addr, unsigned char *netmask,
                          void *data)
 {
@@ -260,8 +247,8 @@ const struct net_user_info slip_user_info = {
        .open           = slip_open,
        .close          = slip_close,
        .remove         = NULL,
-       .set_mtu        = slip_set_mtu,
        .add_address    = slip_add_addr,
        .delete_address = slip_del_addr,
-       .max_packet     = BUF_SIZE
+       .mtu            = BUF_SIZE,
+       .max_packet     = BUF_SIZE,
 };