Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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) {