Skip to content

Commit

Permalink
rxrpc: Fix a bit of time confusion
Browse files Browse the repository at this point in the history
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: a158bdd ("rxrpc: Fix call timeouts")
Signed-off-by: David Howells <dhowells@redhat.com>
  • Loading branch information
David Howells committed Mar 30, 2018
1 parent ace45be commit f82eb88
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/rxrpc/call_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f82eb88

Please sign in to comment.