diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 20:22:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 20:22:16 -0400 |
| commit | 9631eb0bc18bc1fd1cc84e535260d67ed6a36865 (patch) | |
| tree | 4035e815fe051d0c357a10c4201c0fca2ffdbdcd /net/ipv4/tcp_output.c | |
| parent | b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af (diff) | |
| parent | 50c9cc2e540aeaab78ab548a8d42568977c6844f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
[TCP]: slow_start_after_idle should influence cwnd validation too
[SC92031]: Fix priv->lock context
[NET_SCHED]: cls_tcindex: fix compatibility breakage
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 688b95594f2e..3c24881f2a65 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -943,7 +943,8 @@ static void tcp_cwnd_validate(struct sock *sk, struct tcp_sock *tp) | |||
| 943 | if (tp->packets_out > tp->snd_cwnd_used) | 943 | if (tp->packets_out > tp->snd_cwnd_used) |
| 944 | tp->snd_cwnd_used = tp->packets_out; | 944 | tp->snd_cwnd_used = tp->packets_out; |
| 945 | 945 | ||
| 946 | if ((s32)(tcp_time_stamp - tp->snd_cwnd_stamp) >= inet_csk(sk)->icsk_rto) | 946 | if (sysctl_tcp_slow_start_after_idle && |
| 947 | (s32)(tcp_time_stamp - tp->snd_cwnd_stamp) >= inet_csk(sk)->icsk_rto) | ||
| 947 | tcp_cwnd_application_limited(sk); | 948 | tcp_cwnd_application_limited(sk); |
| 948 | } | 949 | } |
| 949 | } | 950 | } |