diff options
| author |   David Howells <dhowells@redhat.com> | 2018-03-30 21:04:43 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2018-03-30 21:04:43 +0100 |
| commit | f82eb88b0fa6943f58760fd7c3d1b12c1f9cf492 (patch) | |
| tree | 068e6974c36acd2376c2a64315581b72587ffd37 /net/rxrpc | |
| parent | rxrpc: Fix firewall route keepalive (diff) | |
| download | linux-dev-f82eb88b0fa6943f58760fd7c3d1b12c1f9cf492.tar.xz linux-dev-f82eb88b0fa6943f58760fd7c3d1b12c1f9cf492.zip | |
rxrpc: Fix a bit of time confusion
The rxrpc_reduce_call_timer() function should be passed the 'current time'
in jiffies, not the current ktime time. It's confusing in rxrpc_resend
because that has to deal with both. Pass the correct current time in.
Note that this only affects the trace produced and not the functioning of
the code.
Fixes: a158bdd3247b ("rxrpc: Fix call timeouts")
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/call_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index 6a62e42e1d8d..3dee89c7a06e 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -238,7 +238,7 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j) * retransmitting data. */ if (!retrans) { - rxrpc_reduce_call_timer(call, resend_at, now, + rxrpc_reduce_call_timer(call, resend_at, now_j, rxrpc_timer_set_for_resend); spin_unlock_bh(&call->lock); ack_ts = ktime_sub(now, call->acks_latest_ts); |