diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-30 10:07:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-30 10:07:34 -0500 |
| commit | 6c9257a708883bbafa0971eb985cd266d46db0eb (patch) | |
| tree | 8ce7db1fc9fc0d14aa923f3f2a848ffc990fe4cb /net/rxrpc/sendmsg.c | |
| parent | 1c08ac0c4bd8e9d66c4dde29bc496c3b430dd028 (diff) | |
| parent | 282ef4729195c8503f7101d574acfb5e7c8a8209 (diff) | |
| download | linux-6c9257a708883bbafa0971eb985cd266d46db0eb.tar.bz2 | |
Merge tag 'rxrpc-fixes-20171129' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
David Howells says:
====================
rxrpc: Fixes
Here are three patches for AF_RXRPC. One removes some whitespace, one
fixes terminal ACK generation and the third makes a couple of places
actually use the timeout value just determined rather than ignoring it.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/sendmsg.c')
| -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 a1c53ac066a1..09f2a3e05221 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c @@ -233,7 +233,7 @@ static void rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call, if (resend_at < 1) resend_at = 1; - resend_at = now + rxrpc_resend_timeout; + resend_at += now; WRITE_ONCE(call->resend_at, resend_at); rxrpc_reduce_call_timer(call, resend_at, now, rxrpc_timer_set_for_send); |