Skip to content
GitLab
Commit cdada08e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

parents 92732144 2ad41065
Show whitespace changes
Inline Side-by-side
net/ipv4/tcp_input.c
View file @ cdada08e
...@@ -2239,6 +2239,7 @@ static int tcp_ack_update_window(struct sock *sk, struct tcp_sock *tp, ...@@ -2239,6 +2239,7 @@ static int tcp_ack_update_window(struct sock *sk, struct tcp_sock *tp,
/* Note, it is the only place, where /* Note, it is the only place, where
* fast path is recovered for sending TCP. * fast path is recovered for sending TCP.
*/ */
tp->pred_flags = 0;
tcp_fast_path_check(sk, tp); tcp_fast_path_check(sk, tp);
if (nwin > tp->max_window) { if (nwin > tp->max_window) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment