diff options
| author | David Howells <dhowells@redhat.com> | 2016-09-23 13:39:22 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-09-23 16:49:19 +0200 |
| commit | 01a88f7f6bd4514de9551c3fc9a6fd9e65cbf79d (patch) | |
| tree | 78a27b9b3e2d3a4d3f5203f910dc45d9eaeb2141 /net/rxrpc/call_object.c | |
| parent | rxrpc: Fix accidental cancellation of scheduled resend by ACK parser (diff) | |
| download | linux-01a88f7f6bd4514de9551c3fc9a6fd9e65cbf79d.tar.xz linux-01a88f7f6bd4514de9551c3fc9a6fd9e65cbf79d.zip | |
rxrpc: Fix call timer
Fix the call timer in the following ways:
(1) If call->resend_at or call->ack_at are before or equal to the current
time, then ignore that timeout.
(2) If call->expire_at is before or equal to the current time, then don't
set the timer at all (possibly we should queue the call).
(3) Don't skip modifying the timer if timer_pending() is true. This
indicates that the timer is working, not that it has expired and is
running/waiting to run its expiry handler.
Also call rxrpc_set_timer() to start the call timer going rather than
calling add_timer().
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/call_object.c')
| -rw-r--r-- | net/rxrpc/call_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index f50a6094e198..f2fadf667e19 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -199,8 +199,8 @@ static void rxrpc_start_call_timer(struct rxrpc_call *call) call->expire_at = expire_at; call->ack_at = expire_at; call->resend_at = expire_at; - call->timer.expires = expire_at; - add_timer(&call->timer); + call->timer.expires = expire_at + 1; + rxrpc_set_timer(call); } /* |