summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-27 22:13:32 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-27 22:13:32 -0400
commit434f1d10c1adb6c2e333d501ce1e42be610e0723 (patch)
treea43f1e6f40ea1530e648ae72709a2c45442891aa /net
parent6070fe6f82c67021367092855c0812a98becf0fa (diff)
parent741b2252a5e14d6c60a913c77a6099abe73a854a (diff)
downloadlinux-3.10-434f1d10c1adb6c2e333d501ce1e42be610e0723.tar.gz
linux-3.10-434f1d10c1adb6c2e333d501ce1e42be610e0723.tar.bz2
linux-3.10-434f1d10c1adb6c2e333d501ce1e42be610e0723.zip
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net')
-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) {