From: Andi Kleen <andi@firstfloor.org>
To: "Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>
Cc: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Subject: Re: [PATCH 01/10] tcp: force mss equality with the next skb too.
Date: Fri, 05 Dec 2008 23:13:35 +0100 [thread overview]
Message-ID: <87abbaw9rk.fsf@basil.nowhere.org> (raw)
In-Reply-To: <1228510736-3655-2-git-send-email-ilpo.jarvinen@helsinki.fi> (Ilpo Järvinen's message of "Fri, 5 Dec 2008 22:58:47 +0200")
"Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi> writes:
> +++ 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;
Perhaps it's just me, but I think the code was far more readable
before your change.
-Andi
--
ak@linux.intel.com
next prev parent reply other threads:[~2008-12-05 22:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-05 20:58 [PATCH 0/10]: tcp & more tcp Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 01/10] tcp: force mss equality with the next skb too Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 02/10] tcp: Fix thinko making the not-shiftable to cover S|R as well Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 03/10] tcp: make mtu probe failure to not break gso'ed skbs unnecessarily Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 04/10] tcp: introduce struct tcp_sacktag_state to reduce arg pressure Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 05/10] tcp: no need to pass prev skb around, reduces " Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 06/10] tcp: drop tcp_bound_rto, merge content of it tcp_set_rto Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 07/10] tcp: share code through function, not through copy-paste. :-) Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 08/10] tcp: move some parts from tcp_write_xmit Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 09/10] tcp: use tcp_write_xmit also in tcp_push_one Ilpo Järvinen
2008-12-05 20:58 ` [PATCH 10/10] tcp: fix tso_should_defer in 64bit Ilpo Järvinen
2008-12-05 22:13 ` Andi Kleen [this message]
2008-12-06 6:49 ` [PATCH 0/10]: tcp & more tcp David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87abbaw9rk.fsf@basil.nowhere.org \
--to=andi@firstfloor.org \
--cc=davem@davemloft.net \
--cc=ilpo.jarvinen@helsinki.fi \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).