From patchwork Sat Nov 5 14:23:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng King X-Patchwork-Id: 123850 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4A41EB7010 for ; Sun, 6 Nov 2011 01:23:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752058Ab1KEOXe (ORCPT ); Sat, 5 Nov 2011 10:23:34 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:49467 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129Ab1KEOXd (ORCPT ); Sat, 5 Nov 2011 10:23:33 -0400 Received: by ggnb2 with SMTP id b2so3533920ggn.19 for ; Sat, 05 Nov 2011 07:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=XUxBb4f1XKgsd3fxFiwcPTA2+av7XMRd5gUUa8q0fGY=; b=FJ3eJBKLVu2ooMveb+9ARnxwFBJL37OZLRiUNtcam/4frhOsg51lJLzMrnqSx9OvMu 2pWnZ3vvKr8auBZBYFarERJFpMYQTLvyR8L0K4qFO6o/Y1e0LXZpqX3gzAYjLxQuF5sV aKGju8Sg1lb+Uu465OvlannibvLCP0DA4dSbo= Received: by 10.50.42.198 with SMTP id q6mr22401954igl.34.1320503012144; Sat, 05 Nov 2011 07:23:32 -0700 (PDT) Received: from gmail.com ([112.95.206.95]) by mx.google.com with ESMTPS id b8sm19000275pba.16.2011.11.05.07.23.29 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Nov 2011 07:23:31 -0700 (PDT) From: Feng King To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-kernel@vger.kernel.org, Feng King Subject: [PATCH] tcp: Fix comments for Nagle algorithm Date: Sat, 5 Nov 2011 22:23:23 +0800 Message-Id: <1320503003-5169-1-git-send-email-kinwin2008@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 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. */