diff options
| author | David Howells <dhowells@redhat.com> | 2018-10-08 16:46:11 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2018-10-08 23:42:04 +0200 |
| commit | 298bc15b2079c324e82d0a6fda39c3d762af7282 (patch) | |
| tree | 4c40d298df2ee83702d152bf8b163c60769c3e99 /net/rxrpc | |
| parent | rxrpc: Carry call state out of locked section in rxrpc_rotate_tx_window() (diff) | |
| download | linux-298bc15b2079c324e82d0a6fda39c3d762af7282.tar.xz linux-298bc15b2079c324e82d0a6fda39c3d762af7282.zip | |
rxrpc: Only take the rwind and mtu values from latest ACK
Move the out-of-order and duplicate ACK packet check to before the call to
rxrpc_input_ackinfo() so that the receive window size and MTU size are only
checked in the latest ACK packet and don't regress.
Fixes: 248f219cb8bc ("rxrpc: Rewrite the data and ack handling code")
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/input.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index af8ce64f4162..04213a65c1ac 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -868,6 +868,16 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb, rxrpc_propose_ack_respond_to_ack); } + /* Discard any out-of-order or duplicate ACKs. */ + if (before_eq(sp->hdr.serial, call->acks_latest)) { + _debug("discard ACK %d <= %d", + sp->hdr.serial, call->acks_latest); + return; + } + call->acks_latest_ts = skb->tstamp; + call->acks_latest = sp->hdr.serial; + + /* Parse rwind and mtu sizes if provided. */ ioffset = offset + nr_acks + 3; if (skb->len >= ioffset + sizeof(buf.info)) { if (skb_copy_bits(skb, ioffset, &buf.info, sizeof(buf.info)) < 0) @@ -889,15 +899,6 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb, return; } - /* Discard any out-of-order or duplicate ACKs. */ - if (before_eq(sp->hdr.serial, call->acks_latest)) { - _debug("discard ACK %d <= %d", - sp->hdr.serial, call->acks_latest); - return; - } - call->acks_latest_ts = skb->tstamp; - call->acks_latest = sp->hdr.serial; - if (before(hard_ack, call->tx_hard_ack) || after(hard_ack, call->tx_top)) return rxrpc_proto_abort("AKW", call, 0); |