]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
rxrpc: Should be using ktime_add_ms() not ktime_add_ns()
authorDavid Howells <dhowells@redhat.com>
Fri, 23 Sep 2016 11:39:23 +0000 (12:39 +0100)
committerDavid Howells <dhowells@redhat.com>
Fri, 23 Sep 2016 12:23:09 +0000 (13:23 +0100)
ktime_add_ms() should be used to add the resend time (in ms) rather than
ktime_add_ns().

Signed-off-by: David Howells <dhowells@redhat.com>
net/rxrpc/call_event.c

index 6e2ea8f4ae7532162252f84a60509f34ff8a0f81..a2909da5d581fbf9967be5142a41cb86c0a76fbf 100644 (file)
@@ -187,7 +187,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
                call->rxtx_annotations[ix] = RXRPC_TX_ANNO_RETRANS | annotation;
        }
 
-       resend_at = ktime_sub(ktime_add_ns(oldest, rxrpc_resend_timeout), now);
+       resend_at = ktime_sub(ktime_add_ms(oldest, rxrpc_resend_timeout), now);
        call->resend_at = jiffies + nsecs_to_jiffies(ktime_to_ns(resend_at));
 
        /* Now go through the Tx window and perform the retransmissions.  We