[PATCH] tcp: Fix comments for Nagle algorithm

[PATCH] tcp: Fix comments for Nagle algorithm

[Feng King]

TCP_NODELAY is weaker than TCP_CORK, when TCP_CORK was set, small
segments will always pass Nagle test regardless of TCP_NODELAY option.

Signed-off-by: Feng King <kinwin2008@gmail.com>

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 882e0b0..a908f95 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1377,7 +1377,7 @@ static inline int tcp_minshall_check(const struct tcp_sock *tp)
 /* Return 0, if packet can be sent now without violation Nagle's rules:
  * 1. It is full sized.
  * 2. Or it contains FIN. (already checked by caller)
- * 3. Or TCP_NODELAY was set.
+ * 3. Or TCP_CORK is not set, and TCP_NODELAY is set.
  * 4. Or TCP_CORK is not set, and all sent packets are ACKed.
  *    With Minshall's modification: all sent small packets are ACKed.
  */
-- 
1.7.1

Re: [PATCH] tcp: Fix comments for Nagle algorithm

[Srivatsa S. Bhat]

On 11/05/2011 07:53 PM, Feng King wrote:
> TCP_NODELAY is weaker than TCP_CORK, when TCP_CORK was set, small
> segments will always pass Nagle test regardless of TCP_NODELAY option.
> 
> Signed-off-by: Feng King <kinwin2008@gmail.com>
> 

You have missed adding "---" after the Signed-off-by line.
The tools that are used to extract the patch from the email will look
for that symbol to distinguish things.

[FYI, tools like git or stgit can generate your patches in the right
format automatically for you.]

Thanks,
Srivatsa S. Bhat

> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
> index 882e0b0..a908f95 100644
> --- a/net/ipv4/tcp_output.c
> +++ b/net/ipv4/tcp_output.c
> @@ -1377,7 +1377,7 @@ static inline int tcp_minshall_check(const struct tcp_sock *tp)
>  /* Return 0, if packet can be sent now without violation Nagle's rules:
>   * 1. It is full sized.
>   * 2. Or it contains FIN. (already checked by caller)
> - * 3. Or TCP_NODELAY was set.
> + * 3. Or TCP_CORK is not set, and TCP_NODELAY is set.
>   * 4. Or TCP_CORK is not set, and all sent packets are ACKed.
>   *    With Minshall's modification: all sent small packets are ACKed.
>   */

Re: [PATCH] tcp: Fix comments for Nagle algorithm

[David Miller]

From: Feng King <kinwin2008@gmail.com>
Date: Sat,  5 Nov 2011 22:23:23 +0800

> TCP_NODELAY is weaker than TCP_CORK, when TCP_CORK was set, small
> segments will always pass Nagle test regardless of TCP_NODELAY option.
> 
> Signed-off-by: Feng King <kinwin2008@gmail.com>

Applied, thanks.

Re: [PATCH] tcp: Fix comments for Nagle algorithm

[David Miller]

Patch is massively corrupted by your email client, making it useless
to us.

Please read Documentation/email-clients.txt and resubmit this patch only
after you've successfully emailed the patch to yourself and verified that
you can apply it successfully.