Commit b5e2c457 authored Jun 11, 2015 by Eric Dumazet Committed by David S. Miller Jun 11, 2015

tcp: remove obsolete check in tcp_set_skb_tso_segs()



We had various issues in the past when TCP stack was modifying
gso_size/gso_segs while clones were in flight.

Commit c52e2421 ("tcp: must unclone packets before mangling them")
fixed these bugs and added a WARN_ON_ONCE(skb_cloned(skb)); in
tcp_set_skb_tso_segs()

These bugs are now fixed, and because TCP stack now only sets
shinfo->gso_size|segs on the clone itself, the check can be removed.

As a result of this change, compiler inlines tcp_set_skb_tso_segs() in
tcp_init_tso_segs()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f69ad292

net/ipv4/tcp_output.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1066,9 +1066,6 @@ static void tcp_queue_skb(struct sock sk, struct sk_buff skb)
		/* Initialize TSO segments for a packet. */
		static void tcp_set_skb_tso_segs(struct sk_buff *skb, unsigned int mss_now)
		{
		/* Make sure we own this skb before messing gso_size/gso_segs */
		WARN_ON_ONCE(skb_cloned(skb));

		if (skb->len <= mss_now \|\| skb->ip_summed == CHECKSUM_NONE) {
		/* Avoid the costly divide in the normal
		* non-TSO case.

Admin message