diff options
| author | David Howells <dhowells@redhat.com> | 2016-10-06 08:11:49 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-10-06 08:11:49 +0100 |
| commit | a5af7e1fc69a46f29b977fd4b570e0ac414c2338 (patch) | |
| tree | d3ecc4df97f90a40d3f3aa6827bfe4201eba71e7 /net/rxrpc/input.c | |
| parent | 26cb02aa6d3efeb543805ed9ad599dae24f7c6d4 (diff) | |
| download | linux-0-day-a5af7e1fc69a46f29b977fd4b570e0ac414c2338.tar.gz linux-0-day-a5af7e1fc69a46f29b977fd4b570e0ac414c2338.tar.xz | |
rxrpc: Fix loss of PING RESPONSE ACK production due to PING ACKs
Separate the output of PING ACKs from the output of other sorts of ACK so
that if we receive a PING ACK and schedule transmission of a PING RESPONSE
ACK, the response doesn't get cancelled by a PING ACK we happen to be
scheduling transmission of at the same time.
If a PING RESPONSE gets lost, the other side might just sit there waiting
for it and refuse to proceed otherwise.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/input.c')
| -rw-r--r-- | net/rxrpc/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 103d2b0d46906..a6da83f036d6c 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -625,9 +625,9 @@ static void rxrpc_input_ping_response(struct rxrpc_call *call, rxrpc_serial_t ping_serial; ktime_t ping_time; - ping_time = call->ackr_ping_time; + ping_time = call->ping_time; smp_rmb(); - ping_serial = call->ackr_ping; + ping_serial = call->ping_serial; if (!test_bit(RXRPC_CALL_PINGING, &call->flags) || before(orig_serial, ping_serial)) |