PERFORCE change 50000 for review
Warner Losh
imp at FreeBSD.org
Tue Mar 30 12:31:17 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=50000
Change 50000 by imp at 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;
}
More information about the p4-projects
mailing list