tcp: force mss equality with the next skb too.

Also make if-goto forest nicer looking.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen
2008-12-05 22:40:47 -08:00
committed by David S. Miller
parent 61c1d052a3
commit f0bc52f38b

View File

@@ -1575,11 +1575,10 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
goto out; goto out;
skb = tcp_write_queue_next(sk, prev); skb = tcp_write_queue_next(sk, prev);
if (!skb_can_shift(skb)) if (!skb_can_shift(skb) ||
goto out; (skb == tcp_send_head(sk)) ||
if (skb == tcp_send_head(sk)) ((TCP_SKB_CB(skb)->sacked & TCPCB_TAGBITS) != TCPCB_SACKED_ACKED) ||
goto out; (mss != tcp_shift_mss(skb)))
if ((TCP_SKB_CB(skb)->sacked & TCPCB_TAGBITS) != TCPCB_SACKED_ACKED)
goto out; goto out;
len = skb->len; len = skb->len;