diff options
-rw-r--r-- | net/rxrpc/ar-ack.c | 2 | ||||
-rw-r--r-- | net/rxrpc/ar-input.c | 3 | ||||
-rw-r--r-- | net/rxrpc/ar-skbuff.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c index 732b82f540c5..1a490d976e7e 100644 --- a/net/rxrpc/ar-ack.c +++ b/net/rxrpc/ar-ack.c | |||
@@ -41,7 +41,7 @@ unsigned rxrpc_soft_ack_delay = 1 * HZ; | |||
41 | * further packets aren't immediately received to decide when to send an IDLE | 41 | * further packets aren't immediately received to decide when to send an IDLE |
42 | * ACK let the other end know that it can free up its Tx buffer space. | 42 | * ACK let the other end know that it can free up its Tx buffer space. |
43 | */ | 43 | */ |
44 | unsigned rxrpc_idle_ack_delay = 1; | 44 | unsigned rxrpc_idle_ack_delay = 0.5 * HZ; |
45 | 45 | ||
46 | static const char *rxrpc_acks(u8 reason) | 46 | static const char *rxrpc_acks(u8 reason) |
47 | { | 47 | { |
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c index 540c03d338c9..e449c675c36a 100644 --- a/net/rxrpc/ar-input.c +++ b/net/rxrpc/ar-input.c | |||
@@ -347,8 +347,7 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb) | |||
347 | * it */ | 347 | * it */ |
348 | if (sp->hdr.flags & RXRPC_REQUEST_ACK) { | 348 | if (sp->hdr.flags & RXRPC_REQUEST_ACK) { |
349 | _proto("ACK Requested on %%%u", serial); | 349 | _proto("ACK Requested on %%%u", serial); |
350 | rxrpc_propose_ACK(call, RXRPC_ACK_REQUESTED, sp->hdr.serial, | 350 | rxrpc_propose_ACK(call, RXRPC_ACK_REQUESTED, sp->hdr.serial, false); |
351 | !(sp->hdr.flags & RXRPC_MORE_PACKETS)); | ||
352 | } | 351 | } |
353 | 352 | ||
354 | switch (sp->hdr.type) { | 353 | switch (sp->hdr.type) { |
diff --git a/net/rxrpc/ar-skbuff.c b/net/rxrpc/ar-skbuff.c index af9f4fd2a365..4cfab49e329d 100644 --- a/net/rxrpc/ar-skbuff.c +++ b/net/rxrpc/ar-skbuff.c | |||
@@ -90,7 +90,7 @@ static void rxrpc_hard_ACK_data(struct rxrpc_call *call, | |||
90 | */ | 90 | */ |
91 | _debug("send Rx idle ACK"); | 91 | _debug("send Rx idle ACK"); |
92 | __rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, sp->hdr.serial, | 92 | __rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, sp->hdr.serial, |
93 | true); | 93 | false); |
94 | } | 94 | } |
95 | 95 | ||
96 | spin_unlock_bh(&call->lock); | 96 | spin_unlock_bh(&call->lock); |