diff options
author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 15:50:51 -0700 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 15:50:51 -0700 |
commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /net/ipv4/tcp_input.c | |
parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
download | op-kernel-dev-a4da0628efd788eb199dd9df225e296035ec2539.zip op-kernel-dev-a4da0628efd788eb199dd9df225e296035ec2539.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv4/tcp_input.c')
-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 677419d0..3e98b57 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) { |