From owner-svn-src-stable-7@FreeBSD.ORG  Fri Sep 24 20:04:24 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 32B25106564A;
	Fri, 24 Sep 2010 20:04:24 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 215A68FC13;
	Fri, 24 Sep 2010 20:04:24 +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 o8OK4OW7038312;
	Fri, 24 Sep 2010 20:04:24 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8OK4OZQ038310;
	Fri, 24 Sep 2010 20:04:24 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201009242004.o8OK4OZQ038310@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 24 Sep 2010 20:04:24 +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: r213138 - stable/7/sys/pci
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, 24 Sep 2010 20:04:24 -0000

Author: yongari
Date: Fri Sep 24 20:04:23 2010
New Revision: 213138
URL: http://svn.freebsd.org/changeset/base/213138

Log:
  MFC r195484:
    Make xl(4) build with Tx checksum offload.
  
    PR:	kern/136409

Modified:
  stable/7/sys/pci/if_xl.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/pci/if_xl.c
==============================================================================
--- stable/7/sys/pci/if_xl.c	Fri Sep 24 19:53:55 2010	(r213137)
+++ stable/7/sys/pci/if_xl.c	Fri Sep 24 20:04:23 2010	(r213138)
@@ -2509,12 +2509,12 @@ xl_encap(struct xl_softc *sc, struct xl_
 		status = XL_TXSTAT_RND_DEFEAT;
 
 #ifndef XL905B_TXCSUM_BROKEN
-		if (m_head->m_pkthdr.csum_flags) {
-			if (m_head->m_pkthdr.csum_flags & CSUM_IP)
+		if ((*m_head)->m_pkthdr.csum_flags) {
+			if ((*m_head)->m_pkthdr.csum_flags & CSUM_IP)
 				status |= XL_TXSTAT_IPCKSUM;
-			if (m_head->m_pkthdr.csum_flags & CSUM_TCP)
+			if ((*m_head)->m_pkthdr.csum_flags & CSUM_TCP)
 				status |= XL_TXSTAT_TCPCKSUM;
-			if (m_head->m_pkthdr.csum_flags & CSUM_UDP)
+			if ((*m_head)->m_pkthdr.csum_flags & CSUM_UDP)
 				status |= XL_TXSTAT_UDPCKSUM;
 		}
 #endif