[TCP]: Add tcp_for_write_queue_from_safe and use it in mtu_probe

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index b41176f380d7..7d8583a15d02 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1350,9 +1350,7 @@ static int tcp_mtu_probe(struct sock *sk)
         tcp_insert_write_queue_before(nskb, skb, sk);
 
         len = 0;
-        while (len < probe_size) {
-                next = tcp_write_queue_next(sk, skb);
-
+        tcp_for_write_queue_from_safe(skb, next, sk) {
                 copy = min_t(int, skb->len, probe_size - len);
                 if (nskb->ip_summed)
                         skb_copy_bits(skb, 0, skb_put(nskb, copy), copy);
@@ -1381,7 +1379,9 @@ static int tcp_mtu_probe(struct sock *sk)
                 }
 
                 len += copy;
-                skb = next;
+
+                if (len >= probe_size)
+                        break;
         }
         tcp_init_tso_segs(sk, nskb, nskb->len);