diff options
| author | Leon Romanovsky <leon@kernel.org> | 2024-06-16 10:51:25 +0300 |
|---|---|---|
| committer | Leon Romanovsky <leon@kernel.org> | 2024-06-16 10:51:25 +0300 |
| commit | ef5513526bb6a83d7777acf5b79f71d19865563c (patch) | |
| tree | 830e4616f84969ef55914bca55d69beac5a2543c /io_uring/net.c | |
| parent | 2a1251e3dbb2995100b6f351c2452228895386a5 (diff) | |
| parent | 7fc45cb68696c7213c484ec81892bc8a986fde52 (diff) | |
Merge branch 'mana-shared' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Leon Romanovsky says:
====================
net: mana: Allow variable size indirection table
Like we talked, I created new shared branch for this patch:
https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=mana-shared
* 'mana-shared' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
net: mana: Allow variable size indirection table
====================
Link: https://lore.kernel.org/all/20240612183051.GE4966@unreal
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Diffstat (limited to 'io_uring/net.c')
| -rw-r--r-- | io_uring/net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 0a48596429d9..7c98c4d50946 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1127,6 +1127,9 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) flags |= MSG_DONTWAIT; retry_multishot: + kmsg->msg.msg_inq = -1; + kmsg->msg.msg_flags = 0; + if (io_do_buffer_select(req)) { ret = io_recv_buf_select(req, kmsg, &len, issue_flags); if (unlikely(ret)) @@ -1134,9 +1137,6 @@ retry_multishot: sr->buf = NULL; } - kmsg->msg.msg_inq = -1; - kmsg->msg.msg_flags = 0; - if (flags & MSG_WAITALL) min_ret = iov_iter_count(&kmsg->msg.msg_iter); |