rxrpc: Fix a bit of time confusion
authorDavid Howells <dhowells@redhat.com>
Fri, 30 Mar 2018 20:04:43 +0000 (21:04 +0100)
committerDavid Howells <dhowells@redhat.com>
Fri, 30 Mar 2018 20:04:43 +0000 (21:04 +0100)
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>
net/rxrpc/call_event.c

index 6a62e42..3dee89c 100644 (file)
@@ -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);