diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /arch/um/os-Linux/drivers/tuntap_user.c | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/um/os-Linux/drivers/tuntap_user.c')
| -rw-r--r-- | arch/um/os-Linux/drivers/tuntap_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c index 6c55d3c8ea..1037a3b638 100644 --- a/arch/um/os-Linux/drivers/tuntap_user.c +++ b/arch/um/os-Linux/drivers/tuntap_user.c | |||
| @@ -107,7 +107,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote, | |||
| 107 | "errno = %d\n", errno); | 107 | "errno = %d\n", errno); |
| 108 | return err; | 108 | return err; |
| 109 | } | 109 | } |
| 110 | CATCH_EINTR(waitpid(pid, NULL, 0)); | 110 | helper_wait(pid, 0, "tuntap_open_tramp"); |
| 111 | 111 | ||
| 112 | cmsg = CMSG_FIRSTHDR(&msg); | 112 | cmsg = CMSG_FIRSTHDR(&msg); |
| 113 | if (cmsg == NULL) { | 113 | if (cmsg == NULL) { |