---

yaml
---
r: 78267
b: refs/heads/master
c: d67c58e
h: refs/heads/master
i:
  78265: 3b3cce9
  78263: 8298098
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50c4817e9919132639be0adc387b509e04a9ed0a
+refs/heads/master: d67c58e9ae80ea577785111534e49d3ca757ec50

trunk/net/ipv4/tcp_output.c

@@ -1293,7 +1293,6 @@ static int tcp_mtu_probe(struct sock *sk)
 	int len;
 	int probe_size;
 	int size_needed;
-	unsigned int pif;
 	int copy;
 	int mss_now;
 
@@ -1326,11 +1325,9 @@ static int tcp_mtu_probe(struct sock *sk)
 	if (after(tp->snd_nxt + size_needed, tp->snd_una + tp->snd_wnd))
 		return 0;
 
-	/* Do we need to wait to drain cwnd? */
-	pif = tcp_packets_in_flight(tp);
-	if (pif + 2 > tp->snd_cwnd) {
-		/* With no packets in flight, don't stall. */
-		if (pif == 0)
+	/* Do we need to wait to drain cwnd? With none in flight, don't stall */
+	if (tcp_packets_in_flight(tp) + 2 > tp->snd_cwnd) {
+		if (!tcp_packets_in_flight(tp))
 			return -1;
 		else
 			return 0;