Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6

This commit is contained in:
Trond Myklebust 2005-10-27 22:13:32 -04:00
commit 434f1d10c1
4 changed files with 8 additions and 7 deletions

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