diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
| commit | cbefa3258eade263dbc9ae2c1f1ea2ca96e6b457 (patch) | |
| tree | 51f012ef93cc828be4eb693c0ced0503217d1025 /ipc/mqueue.c | |
| parent | 489ff4c7d167be954f715128790bd80d3c888322 (diff) | |
| parent | 25bf368b3d98668c5d5f38e2201d8bca16e52680 (diff) | |
Merge branch 'master'
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) { |