From owner-svn-src-head@FreeBSD.ORG  Thu Feb 21 17:00:36 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3D9CF99;
 Thu, 21 Feb 2013 17:00:36 +0000 (UTC)
 (envelope-from gallatin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2FF586ED;
 Thu, 21 Feb 2013 17:00:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1LH0aZ5094578;
 Thu, 21 Feb 2013 17:00:36 GMT
 (envelope-from gallatin@svn.freebsd.org)
Received: (from gallatin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1LH0agN094577;
 Thu, 21 Feb 2013 17:00:36 GMT
 (envelope-from gallatin@svn.freebsd.org)
Message-Id: <201302211700.r1LH0agN094577@svn.freebsd.org>
From: Andrew Gallatin <gallatin@FreeBSD.org>
Date: Thu, 21 Feb 2013 17:00:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247104 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2013 17:00:36 -0000

Author: gallatin
Date: Thu Feb 21 17:00:35 2013
New Revision: 247104
URL: http://svnweb.freebsd.org/changeset/base/247104

Log:
  Fix tcp_lro_rx_ipv4() for drivers that do not set CSUM_IP_CHECKED.
  Specifcially, in_cksum_hdr() returns 0 (not 0xffff) when the IPv4
  checksum is correct. Without this fix, the tcp_lro code will reject
  good IPv4 traffic from drivers that do not implement IPv4 header
  harder csum offload.
  
  Sponsored by: Myricom Inc.
  
  MFC after:	7 days

Modified:
  head/sys/netinet/tcp_lro.c

Modified: head/sys/netinet/tcp_lro.c
==============================================================================
--- head/sys/netinet/tcp_lro.c	Thu Feb 21 16:59:28 2013	(r247103)
+++ head/sys/netinet/tcp_lro.c	Thu Feb 21 17:00:35 2013	(r247104)
@@ -333,7 +333,7 @@ tcp_lro_rx_ipv4(struct lro_ctrl *lc, str
 		}
 	} else {
 		csum = in_cksum_hdr(ip4);
-		if (__predict_false((csum ^ 0xffff) != 0)) {
+		if (__predict_false((csum) != 0)) {
 			lc->lro_bad_csum++;
 			return (TCP_LRO_CANNOT);
 		}