diff options
| author | David Howells <dhowells@redhat.com> | 2016-09-23 12:39:23 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-09-23 15:35:45 +0100 |
| commit | be8aa3380678183821bd7d7b5dec845f10d776ce (patch) | |
| tree | 14e483a5c1e80d0259c8b1467183a61dce362ee4 /net/rxrpc | |
| parent | dfc3da4404ad1ec42a0a649a4ffa2b0f37e80352 (diff) | |
| download | linux-be8aa3380678183821bd7d7b5dec845f10d776ce.tar.bz2 | |
rxrpc: Fix accidental cancellation of scheduled resend by ACK parser
When rxrpc_input_soft_acks() is parsing the soft-ACKs from an ACK packet,
it updates the Tx packet annotations in the annotation buffer. If a
soft-ACK is an ACK, then we overwrite unack'd, nak'd or to-be-retransmitted
states and that is fine; but if the soft-ACK is an NACK, we overwrite the
to-be-retransmitted with a nak - which isn't.
Instead, we need to let any scheduled retransmission stand if the packet
was NAK'd.
Note that we don't reissue a resend if the annotation is in the
to-be-retransmitted state because someone else must've scheduled the
resend already.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/input.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 06027b6d9c19..d3d69ab1f0a1 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -479,6 +479,8 @@ static void rxrpc_input_soft_acks(struct rxrpc_call *call, u8 *acks, case RXRPC_ACK_TYPE_NACK: if (anno_type == RXRPC_TX_ANNO_NAK) continue; + if (anno_type == RXRPC_TX_ANNO_RETRANS) + continue; call->rxtx_annotations[ix] = RXRPC_TX_ANNO_NAK | annotation; resend = true; |