From owner-p4-projects@FreeBSD.ORG  Tue Sep 12 05:07:36 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 235B916A4EA; Tue, 12 Sep 2006 05:07:36 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F2E4316A4E7
	for <perforce@freebsd.org>; Tue, 12 Sep 2006 05:07:35 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BF4B043D46
	for <perforce@freebsd.org>; Tue, 12 Sep 2006 05:07:35 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8C57ZpL068235
	for <perforce@freebsd.org>; Tue, 12 Sep 2006 05:07:35 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8C57Z9Q068232
	for perforce@freebsd.org; Tue, 12 Sep 2006 05:07:35 GMT
	(envelope-from mjacob@freebsd.org)
Date: Tue, 12 Sep 2006 05:07:35 GMT
Message-Id: <200609120507.k8C57Z9Q068232@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106001 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Sep 2006 05:07:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=106001

Change 106001 by mjacob@newisp on 2006/09/12 05:06:35

	Integrate em change.

Affected files ...

.. //depot/projects/newisp/dev/em/if_em.c#6 integrate

Differences ...

==== //depot/projects/newisp/dev/em/if_em.c#6 (text+ko) ====

@@ -31,7 +31,7 @@
 
 ***************************************************************************/
 
-/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.143 2006/09/10 19:23:27 pdeuskar Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.144 2006/09/11 20:59:01 pdeuskar Exp $*/
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
@@ -1516,8 +1516,10 @@
 	 */
 	if (do_tso && (m_head->m_len <= M_TSO_LEN)) {
 		m_head = m_pullup(m_head, M_TSO_LEN + 4);
-		if (m_head == NULL)
+		*m_headp = m_head;
+		if (m_head == NULL) {
 			return (ENOBUFS);
+		}
 	}
 
 	/*
@@ -1578,7 +1580,7 @@
 
 	/* Do hardware assists */
 	m_head = *m_headp;
-	if ( ifp->if_hwassist > 0) {
+	if (ifp->if_hwassist > 0) {
 		if (em_tso_setup(adapter, m_head, &txd_upper, &txd_lower)) {
 			/* we need to make a final sentinel transmit desc */
 			tso_desc = TRUE;