diff options
| author | David Howells <dhowells@redhat.com> | 2016-09-24 18:05:26 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-09-24 18:05:26 +0100 |
| commit | 805b21b929e29192fb5de16154f616bfc1116e3e (patch) | |
| tree | b48e21a8c4d7b824fe0e9289fe51a9e739a5c46e /net/rxrpc/recvmsg.c | |
| parent | c6a77ff82fb849534748719f37f3f9086d78ed39 (diff) | |
| download | linux-stable-805b21b929e29192fb5de16154f616bfc1116e3e.tar.gz linux-stable-805b21b929e29192fb5de16154f616bfc1116e3e.tar.bz2 linux-stable-805b21b929e29192fb5de16154f616bfc1116e3e.zip | |
rxrpc: Send an ACK after every few DATA packets we receive
Send an ACK if we haven't sent one for the last two packets we've received.
This keeps the other end apprised of where we've got to - which is
important if they're doing slow-start.
We do this in recvmsg so that we can dispatch a packet directly without the
need to wake up the background thread.
This should possibly be made configurable in future.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/recvmsg.c')
| -rw-r--r-- | net/rxrpc/recvmsg.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c index 8c7f3de45bac..a7458c398b9e 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c @@ -201,8 +201,19 @@ static void rxrpc_rotate_rx_window(struct rxrpc_call *call) _debug("%u,%u,%02x", hard_ack, top, flags); trace_rxrpc_receive(call, rxrpc_receive_rotate, serial, hard_ack); - if (flags & RXRPC_LAST_PACKET) + if (flags & RXRPC_LAST_PACKET) { rxrpc_end_rx_phase(call); + } else { + /* Check to see if there's an ACK that needs sending. */ + if (after_eq(hard_ack, call->ackr_consumed + 2) || + after_eq(top, call->ackr_seen + 2) || + (hard_ack == top && after(hard_ack, call->ackr_consumed))) + rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, 0, serial, + true, false, + rxrpc_propose_ack_rotate_rx); + if (call->ackr_reason) + rxrpc_send_call_packet(call, RXRPC_PACKET_TYPE_ACK); + } } /* |