diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-08-29 21:23:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-30 22:45:26 +0200 |
| commit | 22b71c8f4f3db8df92f5e7b081c265bc56c0bd2f (patch) | |
| tree | b913f63369b09ad703ed52a42b367455785ef3af /net/dccp/ccids | |
| parent | dccp ccid-2: Remove wrappers around sk_{reset,stop}_timer() (diff) | |
| download | linux-22b71c8f4f3db8df92f5e7b081c265bc56c0bd2f.tar.xz linux-22b71c8f4f3db8df92f5e7b081c265bc56c0bd2f.zip | |
tcp/dccp: Consolidate common code for RFC 3390 conversion
This patch consolidates initial-window code common to TCP and CCID-2:
* TCP uses RFC 3390 in a packet-oriented manner (tcp_input.c) and
* CCID-2 uses RFC 3390 in packet-oriented manner (RFC 4341).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccids')
| -rw-r--r-- | net/dccp/ccids/ccid2.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index 8c95813bcc67..b9c942a09c98 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c @@ -641,12 +641,8 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk) /* RFC 4341, 5: initialise ssthresh to arbitrarily high (max) value */ hc->tx_ssthresh = ~0U; - /* - * RFC 4341, 5: "The cwnd parameter is initialized to at most four - * packets for new connections, following the rules from [RFC3390]". - * We need to convert the bytes of RFC3390 into the packets of RFC 4341. - */ - hc->tx_cwnd = clamp(4380U / dp->dccps_mss_cache, 2U, 4U); + /* Use larger initial windows (RFC 4341, section 5). */ + hc->tx_cwnd = rfc3390_bytes_to_packets(dp->dccps_mss_cache); /* Make sure that Ack Ratio is enabled and within bounds. */ max_ratio = DIV_ROUND_UP(hc->tx_cwnd, 2); |