From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 28 16:32:38 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 11EEBED4;
 Thu, 28 Feb 2013 16:32:37 +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 517A2FBF;
 Thu, 28 Feb 2013 16:32:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SGWbsG062463;
 Thu, 28 Feb 2013 16:32:37 GMT
 (envelope-from gallatin@svn.freebsd.org)
Received: (from gallatin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SGWbTn062462;
 Thu, 28 Feb 2013 16:32:37 GMT
 (envelope-from gallatin@svn.freebsd.org)
Message-Id: <201302281632.r1SGWbTn062462@svn.freebsd.org>
From: Andrew Gallatin <gallatin@FreeBSD.org>
Date: Thu, 28 Feb 2013 16:32:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247470 - stable/9/sys/netinet
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Feb 2013 16:32:38 -0000

Author: gallatin
Date: Thu Feb 28 16:32:36 2013
New Revision: 247470
URL: http://svnweb.freebsd.org/changeset/base/247470

Log:
  MFC r247104:
    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.

Modified:
  stable/9/sys/netinet/tcp_lro.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/tcp_lro.c
==============================================================================
--- stable/9/sys/netinet/tcp_lro.c	Thu Feb 28 16:32:25 2013	(r247469)
+++ stable/9/sys/netinet/tcp_lro.c	Thu Feb 28 16:32:36 2013	(r247470)
@@ -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);
 		}