Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[cascardo/linux.git] / arch / um / drivers / slirp_user.c

diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index a4755bc..a0ada8f 100644 (file)
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -79,7 +79,7 @@ out:
 static void slirp_close(int fd, void *data)
 {
        struct slirp_data *pri = data;
-       int status,err;
+       int err;
 
        close(fd);
        close(pri->slave);
@@ -98,18 +98,9 @@ static void slirp_close(int fd, void *data)
                       "(%d)\n", pri->pid, errno);
        }
 #endif
-
-       CATCH_EINTR(err = waitpid(pri->pid, &status, WNOHANG));
-       if (err < 0) {
-               printk(UM_KERN_ERR "slirp_close: waitpid returned %d\n", errno);
+       err = helper_wait(pri->pid);
+       if (err < 0)
                return;
-       }
-
-       if (err == 0) {
-               printk(UM_KERN_ERR "slirp_close: process %d has not exited\n",
-                      pri->pid);
-               return;
-       }
 
        pri->pid = -1;
 }
@@ -124,18 +115,13 @@ int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri)
        return slip_proto_write(fd, buf, len, &pri->slip);
 }
 
-static int slirp_set_mtu(int mtu, void *data)
-{
-       return mtu;
-}
-
 const struct net_user_info slirp_user_info = {
        .init           = slirp_user_init,
        .open           = slirp_open,
        .close          = slirp_close,
        .remove         = NULL,
-       .set_mtu        = slirp_set_mtu,
        .add_address    = NULL,
        .delete_address = NULL,
-       .max_packet     = BUF_SIZE
+       .mtu            = BUF_SIZE,
+       .max_packet     = BUF_SIZE,
 };