diff options
| author | David Howells <dhowells@redhat.com> | 2023-04-28 21:27:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-05-01 07:43:19 +0100 |
| commit | 0d098d83c5d9e107b2df7f5e11f81492f56d2fe7 (patch) | |
| tree | 3f42c098f198c844795247025d979e55a35082cf /net | |
| parent | 4f163bf82b0244bf4d1e9a6b0f4cf4e90b42496e (diff) | |
| download | linux-stable-0d098d83c5d9e107b2df7f5e11f81492f56d2fe7.tar.gz linux-stable-0d098d83c5d9e107b2df7f5e11f81492f56d2fe7.tar.bz2 linux-stable-0d098d83c5d9e107b2df7f5e11f81492f56d2fe7.zip | |
rxrpc: Fix hard call timeout units
The hard call timeout is specified in the RXRPC_SET_CALL_TIMEOUT cmsg in
seconds, so fix the point at which sendmsg() applies it to the call to
convert to jiffies from seconds, not milliseconds.
Fixes: a158bdd3247b ("rxrpc: Fix timeout of a call that hasn't yet been granted a channel")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: linux-afs@lists.infradead.org
cc: netdev@vger.kernel.org
cc: linux-kernel@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rxrpc/sendmsg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c index 6caa47d352ed..7498a77b5d39 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c @@ -699,7 +699,7 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len) fallthrough; case 1: if (p.call.timeouts.hard > 0) { - j = msecs_to_jiffies(p.call.timeouts.hard); + j = p.call.timeouts.hard * HZ; now = jiffies; j += now; WRITE_ONCE(call->expect_term_by, j); |