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

This commit is contained in:
Linus Torvalds 2005-10-27 16:58:20 -07:00
commit cdada08eb2

View File

@ -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) {