Commit f82eb88b authored Mar 30, 2018 by David Howells

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: a158bdd3 ("rxrpc: Fix call timeouts")
Signed-off-by: David Howells <dhowells@redhat.com>

parent ace45bec

net/rxrpc/call_event.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message