David Miller wrote:
However, I can't think of any reason why the cwnd test should not
apply.
Care to elaborate here? You can view the FIN special case as an off
by one error in the CWND test, it's not going to melt the internet.
:-)
True, it's not going to melt the internet, but why stop at one when two
would finish the connection even faster? Not sure I buy this argument.
Was there some benchmarking data that was a justification for this in
the first place?
My first patch was broken anyway (should not have pulled the test from
tso_should_defer), and the change is not needed to the nagle test since
it's implicit. This patch just restores the old behavior from before
TSO, sending the FIN when it's the last true segment. We can debate the
merits of applying congestion control to the FIN separately. :)
-John
Don't apply FIN exception to full TSO segments.
Signed-off-by: John Heffner <[EMAIL PROTECTED]>
---
commit 89de0d8cb75958b0315c076b31a597143e30f7a4
tree 7e9c321e62729c6ef76e3886fe9edf2ac78a680c
parent c0d4d573feed199b16094c072e7cb07afb01c598
author John Heffner <[EMAIL PROTECTED]> Mon, 05 Feb 2007 18:42:31 -0500
committer John Heffner <[EMAIL PROTECTED]> Mon, 05 Feb 2007 18:42:31 -0500
net/ipv4/tcp_output.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 975f447..58b7111 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -965,7 +965,8 @@ static inline unsigned int tcp_cwnd_test
u32 in_flight, cwnd;
/* Don't be strict about the congestion window for the final FIN. */
- if (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_FIN)
+ if ((TCP_SKB_CB(skb)->flags & TCPCB_FLAG_FIN) &&
+ tcp_skb_pcount(skb) == 1)
return 1;
in_flight = tcp_packets_in_flight(tp);
