diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 18:02:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 18:02:04 -0500 |
| commit | 1cb9d721d9df9182a42d1ff59427a100c6522efc (patch) | |
| tree | 3c7d47828f89853de49e979f97ffe78fd1dba7d6 /ipc/mqueue.c | |
| parent | ca7d5e42d783e54f0057317c9226262d68ab7717 (diff) | |
| parent | bef4a456b8dc8b3638f4d49a25a89e1467da9483 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 59302fc3643b..fd2e26b6f966 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -1018,7 +1018,8 @@ retry: | |||
| 1018 | goto out; | 1018 | goto out; |
| 1019 | } | 1019 | } |
| 1020 | 1020 | ||
| 1021 | ret = netlink_attachskb(sock, nc, 0, MAX_SCHEDULE_TIMEOUT); | 1021 | ret = netlink_attachskb(sock, nc, 0, |
| 1022 | MAX_SCHEDULE_TIMEOUT, NULL); | ||
| 1022 | if (ret == 1) | 1023 | if (ret == 1) |
| 1023 | goto retry; | 1024 | goto retry; |
| 1024 | if (ret) { | 1025 | if (ret) { |