From owner-p4-projects@FreeBSD.ORG  Tue Mar 30 12:31:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BEE2E16A4D0; Tue, 30 Mar 2004 12:31:16 -0800 (PST)
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 93CC816A4CE
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 12:31:16 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8B81B43D45
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 12:31:16 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2UKVGGe011606
	for <perforce@freebsd.org>; Tue, 30 Mar 2004 12:31:16 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2UKVG5F011597
	for perforce@freebsd.org; Tue, 30 Mar 2004 12:31:16 -0800 (PST)
	(envelope-from imp@freebsd.org)
Date: Tue, 30 Mar 2004 12:31:16 -0800 (PST)
Message-Id: <200403302031.i2UKVG5F011597@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 50000 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 30 Mar 2004 20:31:17 -0000

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

Change 50000 by imp@imp_pacopaco on 2004/03/30 12:30:29

	IFC @49998

Affected files ...

.. //depot/projects/power/sys/conf/options#7 integrate
.. //depot/projects/power/sys/pci/if_ste.c#7 integrate

Differences ...

==== //depot/projects/power/sys/conf/options#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.435 2004/03/16 12:23:38 scottl Exp $
+# $FreeBSD: src/sys/conf/options,v 1.436 2004/03/30 18:53:18 vkashyap Exp $
 #
 #        On the handling of kernel options
 #
@@ -71,6 +71,10 @@
 ADW_ALLOW_MEMIO		opt_adw.h	# Allow PCI devices to use memory
 					# mapped I/O
 
+# 3ware 9000 series RAID controller driver options
+TWA_DEBUG		opt_twa.h	# 0-10; 10 prints the most messages.
+TWA_FLASH_FIRMWARE	opt_twa.h	# firmware image bundled when defined.
+
 # Miscellaneous options.
 ADAPTIVE_MUTEXES
 ALQ

==== //depot/projects/power/sys/pci/if_ste.c#7 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/if_ste.c,v 1.63 2004/03/24 17:43:45 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/if_ste.c,v 1.64 2004/03/30 19:23:38 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1473,25 +1473,13 @@
 		/*
 		 * We ran out of segments. We have to recopy this
 		 * mbuf chain first. Bail out if we can't get the
-		 * new buffers. Code borrowed from if_fxp.c
+		 * new buffers.
 		 */
-		MGETHDR(mn, M_DONTWAIT, MT_DATA);
+		mn = m_defrag(m_head, M_DONTWAIT);
 		if (mn == NULL) {
 			m_freem(m_head);
 			return ENOMEM;
 		}
-		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(mn, M_DONTWAIT);
-			if ((mn->m_flags & M_EXT) == 0) {
-				m_freem(mn);
-				m_freem(m_head);
-				return ENOMEM;
-			}
-		}
-		m_copydata(m_head, 0, m_head->m_pkthdr.len,
-		    mtod(mn, caddr_t));
-		mn->m_pkthdr.len = mn->m_len = m_head->m_pkthdr.len;
-		m_freem(m_head);
 		m_head = mn;
 		goto encap_retry;
 	}