aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-27 16:58:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-27 16:58:20 -0700
commitcdada08eb26e7cc57bb423e51e6e70fd5450a0b5 (patch)
tree3235890f93df8ac3922d50fd767d305ea85761b2
parent927321440976d0781a252eefe686ae6b0f236ae2 (diff)
parent2ad41065d9fe518759b695fc2640cf9c07261dd2 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
-rw-r--r--net/ipv4/tcp_input.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 677419d0c9a..3e98b57578d 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,
/* Note, it is the only place, where
* fast path is recovered for sending TCP.
*/
+ tp->pred_flags = 0;
tcp_fast_path_check(sk, tp);
if (nwin > tp->max_window) {