diff options
| author | David Howells <dhowells@redhat.com> | 2016-09-13 22:36:22 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-09-13 22:38:45 +0100 |
| commit | 75e42126399220069ada0ca0e93237993c6afccf (patch) | |
| tree | 33e6f4d4378ac573346d0b405cc335db93c6830f /net/rxrpc/output.c | |
| parent | 3432a757b1f889f8c0d33cd9fcabdae172ed812b (diff) | |
| download | linux-stable-75e42126399220069ada0ca0e93237993c6afccf.tar.gz linux-stable-75e42126399220069ada0ca0e93237993c6afccf.tar.bz2 linux-stable-75e42126399220069ada0ca0e93237993c6afccf.zip | |
rxrpc: Correctly initialise, limit and transmit call->rx_winsize
call->rx_winsize should be initialised to the sysctl setting and the sysctl
setting should be limited to the maximum we want to permit. Further, we
need to place this in the ACK info instead of the sysctl setting.
Furthermore, discard the idea of accepting the subpackets of a jumbo packet
that lie beyond the receive window when the first packet of the jumbo is
within the window. Just discard the excess subpackets instead. This
allows the receive window to be opened up right to the buffer size less one
for the dead slot.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/output.c')
| -rw-r--r-- | net/rxrpc/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 719a4c23f09d..90c7722d5779 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c @@ -71,10 +71,10 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_call *call, mtu = call->conn->params.peer->if_mtu; mtu -= call->conn->params.peer->hdrsize; - jmax = (call->nr_jumbo_dup > 3) ? 1 : rxrpc_rx_jumbo_max; + jmax = (call->nr_jumbo_bad > 3) ? 1 : rxrpc_rx_jumbo_max; pkt->ackinfo.rxMTU = htonl(rxrpc_rx_mtu); pkt->ackinfo.maxMTU = htonl(mtu); - pkt->ackinfo.rwind = htonl(rxrpc_rx_window_size); + pkt->ackinfo.rwind = htonl(call->rx_winsize); pkt->ackinfo.jumbo_max = htonl(jmax); *ackp++ = 0; |