diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 11:09:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 11:09:41 -0500 |
| commit | 4b0955a6edb9b058ca1314ca210a92ee166c4d9a (patch) | |
| tree | 735e60ef67484b67432f2c81babab5bd37cb60ab /ipc/mqueue.c | |
| parent | 5bc159e6cb7ca8d173195919ee935885c129011e (diff) | |
| parent | bab1deea308afcf9200837d6ac20aefe92972efb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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) { |