diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2006-08-04 16:57:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-08-04 22:59:52 -0700 |
| commit | d254bcdbf2199d9e2a52dbe4592e79ef3a456096 (patch) | |
| tree | 0d8225fffdee9a229c6edeb78f3ef705c2713c27 /net | |
| parent | c4c0ce5c57ef0ca47a4428a14de6b5c8cdf8de8a (diff) | |
| download | kernel_samsung_aries-d254bcdbf2199d9e2a52dbe4592e79ef3a456096.zip kernel_samsung_aries-d254bcdbf2199d9e2a52dbe4592e79ef3a456096.tar.gz kernel_samsung_aries-d254bcdbf2199d9e2a52dbe4592e79ef3a456096.tar.bz2 | |
[TCP]: Fixes IW > 2 cases when TCP is application limited
Whenever a transfer is application limited, we are allowed at least
initial window worth of data per window unless cwnd is previously
less than that.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 738dad9..104af5d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3541,7 +3541,8 @@ void tcp_cwnd_application_limited(struct sock *sk) if (inet_csk(sk)->icsk_ca_state == TCP_CA_Open && sk->sk_socket && !test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) { /* Limited by application or receiver window. */ - u32 win_used = max(tp->snd_cwnd_used, 2U); + u32 init_win = tcp_init_cwnd(tp, __sk_dst_get(sk)); + u32 win_used = max(tp->snd_cwnd_used, init_win); if (win_used < tp->snd_cwnd) { tp->snd_ssthresh = tcp_current_ssthresh(sk); tp->snd_cwnd = (tp->snd_cwnd + win_used) >> 1; |