From owner-svn-src-stable-7@FreeBSD.ORG  Fri May 21 04:48:40 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AE1C1065672;
	Fri, 21 May 2010 04:48:40 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 69C0C8FC14;
	Fri, 21 May 2010 04:48:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4L4meuF011511;
	Fri, 21 May 2010 04:48:40 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4L4meog011509;
	Fri, 21 May 2010 04:48:40 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201005210448.o4L4meog011509@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Fri, 21 May 2010 04:48:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208368 - stable/7/sys/netinet
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 May 2010 04:48:40 -0000

Author: ken
Date: Fri May 21 04:48:40 2010
New Revision: 208368
URL: http://svn.freebsd.org/changeset/base/208368

Log:
  MFC r206844:
  
  Don't clear other flags (e.g. CSUM_TCP) when setting CSUM_TSO.  This was
  causing TSO to break for the Xen netfront driver.
  
  Reviewed by:  gibbs, rwatson

Modified:
  stable/7/sys/netinet/tcp_output.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet/tcp_output.c
==============================================================================
--- stable/7/sys/netinet/tcp_output.c	Fri May 21 04:47:22 2010	(r208367)
+++ stable/7/sys/netinet/tcp_output.c	Fri May 21 04:48:40 2010	(r208368)
@@ -995,7 +995,7 @@ send:
 	 * XXX: Fixme: This is currently not the case for IPv6.
 	 */
 	if (tso) {
-		m->m_pkthdr.csum_flags = CSUM_TSO;
+		m->m_pkthdr.csum_flags |= CSUM_TSO;
 		m->m_pkthdr.tso_segsz = tp->t_maxopd - optlen;
 	}