diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /ipc/mqueue.c | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
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) { |