diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /ipc/mqueue.c | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index b3b69fd51330..3e84b958186b 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -1054,7 +1054,7 @@ retry: | |||
| 1054 | } | 1054 | } |
| 1055 | 1055 | ||
| 1056 | timeo = MAX_SCHEDULE_TIMEOUT; | 1056 | timeo = MAX_SCHEDULE_TIMEOUT; |
| 1057 | ret = netlink_attachskb(sock, nc, 0, &timeo, NULL); | 1057 | ret = netlink_attachskb(sock, nc, &timeo, NULL); |
| 1058 | if (ret == 1) | 1058 | if (ret == 1) |
| 1059 | goto retry; | 1059 | goto retry; |
| 1060 | if (ret) { | 1060 | if (ret) { |