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

tcp: force mss equality with the next skb too. 



Also make if-goto forest nicer looking.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61c1d052

net/ipv4/tcp_input.c

+4 −5
Original line number Diff line number Diff line
@@ -1575,11 +1575,10 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb, 
		goto out;

	skb = tcp_write_queue_next(sk, prev);



	if (!skb_can_shift(skb))

		goto out;

	if (skb == tcp_send_head(sk))

		goto out;

	if ((TCP_SKB_CB(skb)->sacked & TCPCB_TAGBITS) != TCPCB_SACKED_ACKED)

	if (!skb_can_shift(skb) ||

	    (skb == tcp_send_head(sk)) ||

	    ((TCP_SKB_CB(skb)->sacked & TCPCB_TAGBITS) != TCPCB_SACKED_ACKED) ||

	    (mss != tcp_shift_mss(skb)))

		goto out;



	len = skb->len;