diff options
Diffstat (limited to 'net/ipv4/tcp_cong.c')
| -rw-r--r-- | net/ipv4/tcp_cong.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c index 6d3e883b48f6..c7cc62c8dc12 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c | |||
| @@ -192,17 +192,26 @@ void tcp_reno_cong_avoid(struct sock *sk, u32 ack, u32 rtt, u32 in_flight, | |||
| 192 | /* In "safe" area, increase. */ | 192 | /* In "safe" area, increase. */ |
| 193 | if (tp->snd_cwnd <= tp->snd_ssthresh) | 193 | if (tp->snd_cwnd <= tp->snd_ssthresh) |
| 194 | tcp_slow_start(tp); | 194 | tcp_slow_start(tp); |
| 195 | else { | 195 | |
| 196 | /* In dangerous area, increase slowly. | 196 | /* In dangerous area, increase slowly. */ |
| 197 | * In theory this is tp->snd_cwnd += 1 / tp->snd_cwnd | 197 | else if (sysctl_tcp_abc) { |
| 198 | */ | 198 | /* RFC3465: Apppriate Byte Count |
| 199 | if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { | 199 | * increase once for each full cwnd acked |
| 200 | if (tp->snd_cwnd < tp->snd_cwnd_clamp) | 200 | */ |
| 201 | tp->snd_cwnd++; | 201 | if (tp->bytes_acked >= tp->snd_cwnd*tp->mss_cache) { |
| 202 | tp->snd_cwnd_cnt = 0; | 202 | tp->bytes_acked -= tp->snd_cwnd*tp->mss_cache; |
| 203 | } else | 203 | if (tp->snd_cwnd < tp->snd_cwnd_clamp) |
| 204 | tp->snd_cwnd_cnt++; | 204 | tp->snd_cwnd++; |
| 205 | } | 205 | } |
| 206 | } else { | ||
| 207 | /* In theory this is tp->snd_cwnd += 1 / tp->snd_cwnd */ | ||
| 208 | if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { | ||
| 209 | if (tp->snd_cwnd < tp->snd_cwnd_clamp) | ||
| 210 | tp->snd_cwnd++; | ||
| 211 | tp->snd_cwnd_cnt = 0; | ||
| 212 | } else | ||
| 213 | tp->snd_cwnd_cnt++; | ||
| 214 | } | ||
| 206 | } | 215 | } |
| 207 | EXPORT_SYMBOL_GPL(tcp_reno_cong_avoid); | 216 | EXPORT_SYMBOL_GPL(tcp_reno_cong_avoid); |
| 208 | 217 | ||