diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /net/ipv4/tcp_yeah.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'net/ipv4/tcp_yeah.c')
| -rw-r--r-- | net/ipv4/tcp_yeah.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c index 9ec843a9bbb2..66b6821b984e 100644 --- a/net/ipv4/tcp_yeah.c +++ b/net/ipv4/tcp_yeah.c | |||
| @@ -94,14 +94,7 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | |||
| 94 | 94 | ||
| 95 | } else { | 95 | } else { |
| 96 | /* Reno */ | 96 | /* Reno */ |
| 97 | 97 | tcp_cong_avoid_ai(tp, tp->snd_cwnd); | |
| 98 | if (tp->snd_cwnd_cnt < tp->snd_cwnd) | ||
| 99 | tp->snd_cwnd_cnt++; | ||
| 100 | |||
| 101 | if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { | ||
| 102 | tp->snd_cwnd++; | ||
| 103 | tp->snd_cwnd_cnt = 0; | ||
| 104 | } | ||
| 105 | } | 98 | } |
| 106 | 99 | ||
| 107 | /* The key players are v_vegas.beg_snd_una and v_beg_snd_nxt. | 100 | /* The key players are v_vegas.beg_snd_una and v_beg_snd_nxt. |