diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-27 19:58:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-27 19:58:20 -0400 |
| commit | cdada08eb26e7cc57bb423e51e6e70fd5450a0b5 (patch) | |
| tree | 3235890f93df8ac3922d50fd767d305ea85761b2 /net | |
| parent | 927321440976d0781a252eefe686ae6b0f236ae2 (diff) | |
| parent | 2ad41065d9fe518759b695fc2640cf9c07261dd2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 677419d0c9ad..3e98b57578dc 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -2239,6 +2239,7 @@ static int tcp_ack_update_window(struct sock *sk, struct tcp_sock *tp, | |||
| 2239 | /* Note, it is the only place, where | 2239 | /* Note, it is the only place, where |
| 2240 | * fast path is recovered for sending TCP. | 2240 | * fast path is recovered for sending TCP. |
| 2241 | */ | 2241 | */ |
| 2242 | tp->pred_flags = 0; | ||
| 2242 | tcp_fast_path_check(sk, tp); | 2243 | tcp_fast_path_check(sk, tp); |
| 2243 | 2244 | ||
| 2244 | if (nwin > tp->max_window) { | 2245 | if (nwin > tp->max_window) { |