summaryrefslogtreecommitdiffstats
path: root/net/rxrpc/sendmsg.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-09-26 22:12:49 +0100
committerDavid Howells <dhowells@redhat.com>2016-09-30 14:40:11 +0100
commitdf0adc788ae74e35ab1a79f3db878df7fdc7db55 (patch)
treec47e59c2105fb9743a68b38af3db2b40d2c69ee6 /net/rxrpc/sendmsg.c
parentc31410ea009d10501ea90f64cdda0083c8cf0161 (diff)
downloadlinux-df0adc788ae74e35ab1a79f3db878df7fdc7db55.tar.bz2
rxrpc: Keep the call timeouts as ktimes rather than jiffies
Keep that call timeouts as ktimes rather than jiffies so that they can be expressed as functions of RTT. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/sendmsg.c')
-rw-r--r--net/rxrpc/sendmsg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c
index d8dfdce874d8..3322543d460a 100644
--- a/net/rxrpc/sendmsg.c
+++ b/net/rxrpc/sendmsg.c
@@ -149,13 +149,13 @@ static void rxrpc_queue_packet(struct rxrpc_call *call, struct sk_buff *skb,
_debug("need instant resend %d", ret);
rxrpc_instant_resend(call, ix);
} else {
- unsigned long resend_at;
+ ktime_t now = ktime_get_real(), resend_at;
- resend_at = jiffies + msecs_to_jiffies(rxrpc_resend_timeout);
+ resend_at = ktime_add_ms(now, rxrpc_resend_timeout);
- if (time_before(resend_at, call->resend_at)) {
+ if (ktime_before(resend_at, call->resend_at)) {
call->resend_at = resend_at;
- rxrpc_set_timer(call, rxrpc_timer_set_for_send);
+ rxrpc_set_timer(call, rxrpc_timer_set_for_send, now);
}
}