aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2008-12-06 01:40:47 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-06 01:40:47 -0500
commitf0bc52f38b09308fca85f3aa9300a341364fe9c6 (patch)
treebe77bd3df702eee48849c4a29fdf9d870b30809f /net
parent61c1d052a3c7d5acba3bd535aaffa5bb5d085181 (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_input.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d67b6e9cc540..63c3ef6d4a1c 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1575,11 +1575,10 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
1575 goto out; 1575 goto out;
1576 skb = tcp_write_queue_next(sk, prev); 1576 skb = tcp_write_queue_next(sk, prev);
1577 1577
1578 if (!skb_can_shift(skb)) 1578 if (!skb_can_shift(skb) ||
1579 goto out; 1579 (skb == tcp_send_head(sk)) ||
1580 if (skb == tcp_send_head(sk)) 1580 ((TCP_SKB_CB(skb)->sacked & TCPCB_TAGBITS) != TCPCB_SACKED_ACKED) ||
1581 goto out; 1581 (mss != tcp_shift_mss(skb)))
1582 if ((TCP_SKB_CB(skb)->sacked & TCPCB_TAGBITS) != TCPCB_SACKED_ACKED)
1583 goto out; 1582 goto out;
1584 1583
1585 len = skb->len; 1584 len = skb->len;