PERFORCE change 142705 for review
Vincenzo Iozzo
snagg at FreeBSD.org
Sun Jun 1 14:51:13 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142705
Change 142705 by snagg at snagg_macosx on 2008/06/01 14:50:19
IFC
Affected files ...
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ath/ah_osdep.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/atkbdc/psm.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/nve/if_nvereg.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/fs/devfs/devfs_vnops.c#4 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_fw_nat.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/libalias/alias.c#3 integrate
Differences ...
==== //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#5 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.618 2008/05/18 04:16:55 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $");
/*
* Manages physical address maps.
@@ -2775,22 +2775,20 @@
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME);
- KASSERT((*firstpte & PG_V) != 0,
- ("pmap_promote_pde: firstpte is missing PG_V"));
- if ((*firstpte & PG_A) == 0) {
+ newpde = *firstpte;
+ if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) {
pmap_pde_p_failures++;
CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx"
" in pmap %p", va, pmap);
return;
}
- pa = *firstpte & PG_PS_FRAME;
- newpde = *firstpte;
if ((newpde & (PG_M | PG_RW)) == PG_RW)
newpde &= ~PG_RW;
/*
* Check all the ptes before promotion
*/
+ pa = newpde & PG_PS_FRAME;
for (pte = firstpte; pte < firstpte + NPTEPG; pte++) {
retry:
oldpte = *pte;
==== //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.4 2008/06/01 01:46:37 jb Exp $
*/
/*
@@ -111,6 +113,7 @@
/* FreeBSD includes: */
#if !defined(sun)
+#include <sys/callout.h>
#include <sys/ctype.h>
#include <sys/limits.h>
#include <sys/kdb.h>
@@ -11400,13 +11403,23 @@
mutex_enter(&dtrace_lock);
/*
- * Because we can be called after dtrace_detach() has been called, we
- * cannot assert that there are retained enablings. We can safely
- * load from dtrace_retained, however: the taskq_destroy() at the
- * end of dtrace_detach() will block pending our completion.
+ * Iterate over all retained enablings to see if any probes match
+ * against them. We only perform this operation on enablings for which
+ * we have sufficient permissions by virtue of being in the global zone
+ * or in the same zone as the DTrace client. Because we can be called
+ * after dtrace_detach() has been called, we cannot assert that there
+ * are retained enablings. We can safely load from dtrace_retained,
+ * however: the taskq_destroy() at the end of dtrace_detach() will
+ * block pending our completion.
*/
- for (enab = dtrace_retained; enab != NULL; enab = enab->dten_next)
- (void) dtrace_enabling_match(enab, NULL);
+ for (enab = dtrace_retained; enab != NULL; enab = enab->dten_next) {
+#if defined(sun)
+ cred_t *cr = enab->dten_vstate->dtvs_state->dts_cred.dcr_cred;
+
+ if (INGLOBALZONE(curproc) || getzoneid() == crgetzoneid(cr))
+#endif
+ (void) dtrace_enabling_match(enab, NULL);
+ }
mutex_exit(&dtrace_lock);
mutex_exit(&cpu_lock);
@@ -12680,6 +12693,7 @@
}
}
+#if defined(sun)
static void
dtrace_state_clean(dtrace_state_t *state)
{
@@ -12697,9 +12711,51 @@
dtrace_sync();
-#if !defined(sun)
+ now = dtrace_gethrtime();
+
+ if (state != dtrace_anon.dta_state &&
+ now - state->dts_laststatus >= dtrace_deadman_user)
+ return;
+
+ /*
+ * We must be sure that dts_alive never appears to be less than the
+ * value upon entry to dtrace_state_deadman(), and because we lack a
+ * dtrace_cas64(), we cannot store to it atomically. We thus instead
+ * store INT64_MAX to it, followed by a memory barrier, followed by
+ * the new value. This assures that dts_alive never appears to be
+ * less than its true value, regardless of the order in which the
+ * stores to the underlying storage are issued.
+ */
+ state->dts_alive = INT64_MAX;
+ dtrace_membar_producer();
+ state->dts_alive = now;
+}
+#else
+static void
+dtrace_state_clean(void *arg)
+{
+ dtrace_state_t *state = arg;
+ dtrace_optval_t *opt = state->dts_options;
+
+ if (state->dts_activity == DTRACE_ACTIVITY_INACTIVE)
+ return;
+
+ dtrace_dynvar_clean(&state->dts_vstate.dtvs_dynvars);
+ dtrace_speculation_clean(state);
+
+ callout_reset(&state->dts_cleaner, hz * opt[DTRACEOPT_CLEANRATE] / NANOSEC,
+ dtrace_state_clean, state);
+}
+
+static void
+dtrace_state_deadman(void *arg)
+{
+ dtrace_state_t *state = arg;
+ hrtime_t now;
+
+ dtrace_sync();
+
dtrace_debug_output();
-#endif
now = dtrace_gethrtime();
@@ -12719,7 +12775,11 @@
state->dts_alive = INT64_MAX;
dtrace_membar_producer();
state->dts_alive = now;
+
+ callout_reset(&state->dts_deadman, hz * dtrace_deadman_interval / NANOSEC,
+ dtrace_state_deadman, state);
}
+#endif
static dtrace_state_t *
#if defined(sun)
@@ -12793,8 +12853,14 @@
*/
state->dts_buffer = kmem_zalloc(bufsize, KM_SLEEP);
state->dts_aggbuffer = kmem_zalloc(bufsize, KM_SLEEP);
+
+#if defined(sun)
state->dts_cleaner = CYCLIC_NONE;
state->dts_deadman = CYCLIC_NONE;
+#else
+ callout_init(&state->dts_cleaner, CALLOUT_MPSAFE);
+ callout_init(&state->dts_deadman, CALLOUT_MPSAFE);
+#endif
state->dts_vstate.dtvs_state = state;
for (i = 0; i < DTRACEOPT_MAX; i++)
@@ -13076,8 +13142,10 @@
dtrace_optval_t *opt = state->dts_options, sz, nspec;
dtrace_speculation_t *spec;
dtrace_buffer_t *buf;
+#if defined(sun)
cyc_handler_t hdlr;
cyc_time_t when;
+#endif
int rval = 0, i, bufsize = NCPU * sizeof (dtrace_buffer_t);
dtrace_icookie_t cookie;
@@ -13255,11 +13323,11 @@
if (opt[DTRACEOPT_CLEANRATE] > dtrace_cleanrate_max)
opt[DTRACEOPT_CLEANRATE] = dtrace_cleanrate_max;
+ state->dts_alive = state->dts_laststatus = dtrace_gethrtime();
+#if defined(sun)
hdlr.cyh_func = (cyc_func_t)dtrace_state_clean;
hdlr.cyh_arg = state;
-#if defined(sun)
hdlr.cyh_level = CY_LOW_LEVEL;
-#endif
when.cyt_when = 0;
when.cyt_interval = opt[DTRACEOPT_CLEANRATE];
@@ -13268,15 +13336,18 @@
hdlr.cyh_func = (cyc_func_t)dtrace_state_deadman;
hdlr.cyh_arg = state;
-#if defined(sun)
hdlr.cyh_level = CY_LOW_LEVEL;
-#endif
when.cyt_when = 0;
when.cyt_interval = dtrace_deadman_interval;
- state->dts_alive = state->dts_laststatus = dtrace_gethrtime();
state->dts_deadman = cyclic_add(&hdlr, &when);
+#else
+ callout_reset(&state->dts_cleaner, hz * opt[DTRACEOPT_CLEANRATE] / NANOSEC,
+ dtrace_state_clean, state);
+ callout_reset(&state->dts_deadman, hz * dtrace_deadman_interval / NANOSEC,
+ dtrace_state_deadman, state);
+#endif
state->dts_activity = DTRACE_ACTIVITY_WARMUP;
@@ -13537,11 +13608,16 @@
for (i = 0; i < nspec; i++)
dtrace_buffer_free(spec[i].dtsp_buffer);
+#if defined(sun)
if (state->dts_cleaner != CYCLIC_NONE)
cyclic_remove(state->dts_cleaner);
if (state->dts_deadman != CYCLIC_NONE)
cyclic_remove(state->dts_deadman);
+#else
+ callout_stop(&state->dts_cleaner);
+ callout_stop(&state->dts_deadman);
+#endif
dtrace_dstate_fini(&vstate->dtvs_dynvars);
dtrace_vstate_fini(vstate);
==== //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h,v 1.3 2008/06/01 01:46:37 jb Exp $
*/
/*
@@ -1137,8 +1139,13 @@
uint32_t dts_dblerrors; /* errors in ERROR probes */
uint32_t dts_reserve; /* space reserved for END */
hrtime_t dts_laststatus; /* time of last status */
+#if defined(sun)
cyclic_id_t dts_cleaner; /* cleaning cyclic */
cyclic_id_t dts_deadman; /* deadman cyclic */
+#else
+ struct callout dts_cleaner; /* Cleaning callout. */
+ struct callout dts_deadman; /* Deadman callout. */
+#endif
hrtime_t dts_alive; /* time last alive */
char dts_speculates; /* boolean: has speculations */
char dts_destructive; /* boolean: has dest. actions */
==== //depot/projects/soc2008/snagg-audit/sys/dev/ath/ah_osdep.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
*
- * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.3 2008/04/20 20:35:35 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.4 2008/05/31 22:44:06 sam Exp $
*/
#ifndef _ATH_AH_OSDEP_H_
#define _ATH_AH_OSDEP_H_
@@ -87,8 +87,11 @@
#define AH_BIG_ENDIAN 4321
#if _BYTE_ORDER == _BIG_ENDIAN
+#define OS_REG_UNSWAPPED(_reg) \
+ (((_reg) >= 0x4000 && (_reg) < 0x5000) || \
+ ((_reg) >= 0x7000 && (_reg) < 0x8000))
#define OS_REG_WRITE(_ah, _reg, _val) do { \
- if ( (_reg) >= 0x4000 && (_reg) < 0x5000) \
+ if (OS_REG_UNSWAPPED(_reg)) \
bus_space_write_4((bus_space_tag_t)(_ah)->ah_st, \
(bus_space_handle_t)(_ah)->ah_sh, (_reg), (_val)); \
else \
@@ -96,12 +99,13 @@
(bus_space_handle_t)(_ah)->ah_sh, (_reg), (_val)); \
} while (0)
#define OS_REG_READ(_ah, _reg) \
- (((_reg) >= 0x4000 && (_reg) < 0x5000) ? \
+ (OS_REG_UNSWAPPED(_reg) ? \
bus_space_read_4((bus_space_tag_t)(_ah)->ah_st, \
(bus_space_handle_t)(_ah)->ah_sh, (_reg)) : \
bus_space_read_stream_4((bus_space_tag_t)(_ah)->ah_st, \
(bus_space_handle_t)(_ah)->ah_sh, (_reg)))
#else /* _BYTE_ORDER == _LITTLE_ENDIAN */
+#define OS_REG_UNSWAPPED(_reg) (0)
#define OS_REG_WRITE(_ah, _reg, _val) \
bus_space_write_4((bus_space_tag_t)(_ah)->ah_st, \
(bus_space_handle_t)(_ah)->ah_sh, (_reg), (_val))
==== //depot/projects/soc2008/snagg-audit/sys/dev/atkbdc/psm.c#2 (text+ko) ====
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.96 2008/04/08 19:09:45 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.97 2008/06/01 13:44:51 philip Exp $");
#include "opt_isa.h"
#include "opt_psm.h"
@@ -367,6 +367,8 @@
0x08, MOUSE_4D_PACKETSIZE, enable_4dmouse },
{ MOUSE_MODEL_4DPLUS, /* A4 Tech 4D+ Mouse */
0xc8, MOUSE_4DPLUS_PACKETSIZE, enable_4dplus },
+ { MOUSE_MODEL_SYNAPTICS, /* Synaptics Touchpad */
+ 0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics },
{ MOUSE_MODEL_INTELLI, /* Microsoft IntelliMouse */
0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_msintelli },
{ MOUSE_MODEL_GLIDEPOINT, /* ALPS GlidePoint */
@@ -375,8 +377,6 @@
0x80, MOUSE_PS2_PACKETSIZE, enable_kmouse },
{ MOUSE_MODEL_VERSAPAD, /* Interlink electronics VersaPad */
0xe8, MOUSE_PS2VERSA_PACKETSIZE, enable_versapad },
- { MOUSE_MODEL_SYNAPTICS, /* Synaptics Touchpad */
- 0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics },
{ MOUSE_MODEL_GENERIC,
0xc0, MOUSE_PS2_PACKETSIZE, NULL },
};
==== //depot/projects/soc2008/snagg-audit/sys/dev/nve/if_nve.c#2 (text+ko) ====
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.29 2007/11/22 02:44:59 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.30 2008/05/31 14:17:36 remko Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,32 +211,52 @@
DRIVER_MODULE(miibus, nve, miibus_driver, miibus_devclass, 0, 0);
static struct nve_type nve_devs[] = {
- {NVIDIA_VENDORID, NFORCE_MCPNET1_DEVICEID,
- "NVIDIA nForce MCP Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET2_DEVICEID,
- "NVIDIA nForce MCP2 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET3_DEVICEID,
- "NVIDIA nForce MCP3 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET4_DEVICEID,
- "NVIDIA nForce MCP4 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET5_DEVICEID,
- "NVIDIA nForce MCP5 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET6_DEVICEID,
- "NVIDIA nForce MCP6 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET7_DEVICEID,
- "NVIDIA nForce MCP7 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET8_DEVICEID,
- "NVIDIA nForce MCP8 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET9_DEVICEID,
- "NVIDIA nForce MCP9 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET10_DEVICEID,
- "NVIDIA nForce MCP10 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET11_DEVICEID,
- "NVIDIA nForce MCP11 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET12_DEVICEID,
- "NVIDIA nForce MCP12 Networking Adapter"},
- {NVIDIA_VENDORID, NFORCE_MCPNET13_DEVICEID,
- "NVIDIA nForce MCP13 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_LAN,
+ "NVIDIA nForce MCP Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_LAN,
+ "NVIDIA nForce2 MCP2 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1,
+ "NVIDIA nForce2 400 MCP4 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2,
+ "NVIDIA nForce2 400 MCP5 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN1,
+ "NVIDIA nForce3 MCP3 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN,
+ "NVIDIA nForce3 250 MCP6 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN4,
+ "NVIDIA nForce3 MCP7 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN1,
+ "NVIDIA nForce4 CK804 MCP8 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN2,
+ "NVIDIA nForce4 CK804 MCP9 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN1,
+ "NVIDIA nForce MCP04 Networking Adapter"}, // MCP10
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN2,
+ "NVIDIA nForce MCP04 Networking Adapter"}, // MCP11
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN1,
+ "NVIDIA nForce 430 MCP12 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN2,
+ "NVIDIA nForce 430 MCP13 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN1,
+ "NVIDIA nForce MCP55 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN2,
+ "NVIDIA nForce MCP55 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN1,
+ "NVIDIA nForce MCP61 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN2,
+ "NVIDIA nForce MCP61 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN3,
+ "NVIDIA nForce MCP61 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN4,
+ "NVIDIA nForce MCP61 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN1,
+ "NVIDIA nForce MCP65 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN2,
+ "NVIDIA nForce MCP65 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN3,
+ "NVIDIA nForce MCP65 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN4,
+ "NVIDIA nForce MCP65 Networking Adapter"},
{0, 0, NULL}
};
==== //depot/projects/soc2008/snagg-audit/sys/dev/nve/if_nvereg.h#2 (text+ko) ====
@@ -25,29 +25,47 @@
* SUCH DAMAGE.
*
* $Id: if_nvreg.h,v 1.6 2004/08/12 14:00:05 q Exp $
- * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.8 2006/12/05 15:31:05 jhb Exp $
+ * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.9 2008/05/31 14:17:36 remko Exp $
*/
#ifndef _IF_NVEREG_H_
#define _IF_NVEREG_H_
-#ifndef NVIDIA_VENDORID
-#define NVIDIA_VENDORID 0x10DE
+#ifndef PCI_VENDOR_NVIDIA
+#define PCI_VENDOR_NVIDIA 0x10DE
#endif
-#define NFORCE_MCPNET1_DEVICEID 0x01C3
-#define NFORCE_MCPNET2_DEVICEID 0x0066
-#define NFORCE_MCPNET3_DEVICEID 0x00D6
-#define NFORCE_MCPNET4_DEVICEID 0x0086
-#define NFORCE_MCPNET5_DEVICEID 0x008C
-#define NFORCE_MCPNET6_DEVICEID 0x00E6
-#define NFORCE_MCPNET7_DEVICEID 0x00DF
-#define NFORCE_MCPNET8_DEVICEID 0x0056
-#define NFORCE_MCPNET9_DEVICEID 0x0057
-#define NFORCE_MCPNET10_DEVICEID 0x0037
-#define NFORCE_MCPNET11_DEVICEID 0x0038
-#define NFORCE_MCPNET12_DEVICEID 0x0268
-#define NFORCE_MCPNET13_DEVICEID 0x0269
+#define PCI_PRODUCT_NVIDIA_NFORCE_LAN 0x01C3
+#define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066
+#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN1 0x00D6
+#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 0x0086
+#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 0x008C
+#define PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN 0x00E6
+#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN4 0x00DF
+#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN1 0x0056
+#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN2 0x0057
+#define PCI_PRODUCT_NVIDIA_MCP04_LAN1 0x0037
+#define PCI_PRODUCT_NVIDIA_MCP04_LAN2 0x0038
+#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN1 0x0268
+#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN2 0x0269
+#define PCI_PRODUCT_NVIDIA_MCP55_LAN1 0x0372
+#define PCI_PRODUCT_NVIDIA_MCP55_LAN2 0x0373
+#define PCI_PRODUCT_NVIDIA_MCP61_LAN1 0x03e5
+#define PCI_PRODUCT_NVIDIA_MCP61_LAN2 0x03e6
+#define PCI_PRODUCT_NVIDIA_MCP61_LAN3 0x03ee
+#define PCI_PRODUCT_NVIDIA_MCP61_LAN4 0x03ef
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN1 0x0450
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN2 0x0451
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN3 0x0452
+#define PCI_PRODUCT_NVIDIA_MCP65_LAN4 0x0453
+
+#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1
+#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2
+#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN5 PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN
+#define PCI_PRODUCT_NVIDIA_CK804_LAN1 PCI_PRODUCT_NVIDIA_NFORCE4_LAN1
+#define PCI_PRODUCT_NVIDIA_CK804_LAN2 PCI_PRODUCT_NVIDIA_NFORCE4_LAN2
+#define PCI_PRODUCT_NVIDIA_MCP51_LAN1 PCI_PRODUCT_NVIDIA_NFORCE430_LAN1
+#define PCI_PRODUCT_NVIDIA_MCP51_LAN2 PCI_PRODUCT_NVIDIA_NFORCE430_LAN2
#define NV_RID 0x10
==== //depot/projects/soc2008/snagg-audit/sys/fs/devfs/devfs_vnops.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
* @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95
* From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43
*
- * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.159 2008/05/23 16:36:39 kib Exp $
+ * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.161 2008/06/01 14:02:46 ed Exp $
*/
/*
@@ -891,9 +891,8 @@
if(fp == NULL)
return (error);
#endif
- KASSERT(fp->f_ops == &badfileops,
- ("Could not vnode bypass device on fdops %p", fp->f_ops));
- finit(fp, fp->f_flag, DTYPE_VNODE, dev, &devfs_ops_f);
+ if (fp->f_ops == &badfileops)
+ finit(fp, fp->f_flag, DTYPE_VNODE, dev, &devfs_ops_f);
return (error);
}
==== //depot/projects/soc2008/snagg-audit/sys/netinet/ip_fw_nat.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_fw_nat.c,v 1.2 2008/03/03 22:32:01 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw_nat.c,v 1.3 2008/06/01 12:29:23 mav Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -318,11 +318,12 @@
c = mtod(mcl, char *);
if (args->oif == NULL)
retval = LibAliasIn(t->lib, c,
- MCLBYTES);
+ mcl->m_len + M_TRAILINGSPACE(mcl));
else
retval = LibAliasOut(t->lib, c,
- MCLBYTES);
- if (retval != PKT_ALIAS_OK) {
+ mcl->m_len + M_TRAILINGSPACE(mcl));
+ if (retval != PKT_ALIAS_OK &&
+ retval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) {
/* XXX - should i add some logging? */
m_free(mcl);
badnat:
==== //depot/projects/soc2008/snagg-audit/sys/netinet/libalias/alias.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.61 2008/05/02 18:54:36 marck Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.62 2008/06/01 11:47:04 mav Exp $");
/*
Alias.c provides supervisory control for the functions of the
@@ -1092,13 +1092,13 @@
/* Local prototypes */
static int FragmentIn(struct libalias *la, struct in_addr ip_src,
- struct in_addr *ip_dst, u_char ip_p, u_short *ip_sum);
+ struct in_addr *ip_dst, u_short ip_id, u_short *ip_sum);
static int FragmentOut(struct libalias *, struct in_addr *ip_src,
u_short *ip_sum);
static int
FragmentIn(struct libalias *la, struct in_addr ip_src, struct in_addr *ip_dst,
- u_char ip_id, u_short *ip_sum)
+ u_short ip_id, u_short *ip_sum)
{
struct alias_link *lnk;
More information about the p4-projects
mailing list