diff options
| author | Ilpo Järvinen <[email protected]> | 2008-12-06 06:40:47 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2008-12-06 06:40:47 +0000 |
| commit | f0bc52f38b09308fca85f3aa9300a341364fe9c6 (patch) | |
| tree | be77bd3df702eee48849c4a29fdf9d870b30809f /net/ipv4/tcp_input.c | |
| parent | dccp: use roundup instead of opencoding (diff) | |
| download | kernel-f0bc52f38b09308fca85f3aa9300a341364fe9c6.tar.gz kernel-f0bc52f38b09308fca85f3aa9300a341364fe9c6.zip | |
tcp: force mss equality with the next skb too.
Also make if-goto forest nicer looking.
Signed-off-by: Ilpo Järvinen <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 9 |
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, 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; |