Commit 234b6860 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[TCP]: Add tcp_for_write_queue_from_safe and use it in mtu_probe 



Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d67c58e9

include/net/tcp.h

+5 −0
Original line number Diff line number Diff line
@@ -1229,6 +1229,11 @@ static inline struct sk_buff *tcp_write_queue_next(struct sock *sk, struct sk_bu 
		for (; (skb != (struct sk_buff *)&(sk)->sk_write_queue);\

		     skb = skb->next)



#define tcp_for_write_queue_from_safe(skb, tmp, sk)			\

		for (tmp = skb->next;					\

		     (skb != (struct sk_buff *)&(sk)->sk_write_queue);	\

		     skb = tmp, tmp = skb->next)



static inline struct sk_buff *tcp_send_head(struct sock *sk)

{

	return sk->sk_send_head;

net/ipv4/tcp_output.c

+4 −4
Original line number Diff line number Diff line
@@ -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);