rxrpc: Fix accidental cancellation of scheduled resend by ACK parser
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 14:35:45 +0000 (15:35 +0100)
commitbe8aa3380678183821bd7d7b5dec845f10d776ce
tree14e483a5c1e80d0259c8b1467183a61dce362ee4
parentdfc3da4404ad1ec42a0a649a4ffa2b0f37e80352
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>
net/rxrpc/input.c