svn commit: r208367 - stable/8/sys/netinet

[Kenneth D. Merry]

Author: ken
Date: Fri May 21 04:47:22 2010
New Revision: 208367
URL: http://svn.freebsd.org/changeset/base/208367

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/8/sys/netinet/tcp_output.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/netinet/tcp_output.c
==============================================================================
--- stable/8/sys/netinet/tcp_output.c	Thu May 20 23:06:53 2010	(r208366)
+++ stable/8/sys/netinet/tcp_output.c	Fri May 21 04:47:22 2010	(r208367)
@@ -1051,7 +1051,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;
 	}