PERFORCE change 187767 for review
John Baldwin
jhb at FreeBSD.org
Thu Jan 13 17:19:05 UTC 2011
http://p4web.freebsd.org/@@187767?ac=10
Change 187767 by jhb at jhb_jhbbsd on 2011/01/13 17:17:59
IFC @187766
Affected files ...
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#18 integrate
.. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#22 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#17 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 integrate
.. //depot/projects/smpng/sys/ddb/db_capture.c#4 integrate
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#18 integrate
.. //depot/projects/smpng/sys/dev/ae/if_ae.c#12 integrate
.. //depot/projects/smpng/sys/dev/age/if_age.c#15 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alc.c#13 integrate
.. //depot/projects/smpng/sys/dev/ale/if_ale.c#10 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#91 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#41 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#122 integrate
.. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#11 integrate
.. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#11 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#36 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#30 integrate
.. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_em.c#24 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_igb.c#29 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_lem.c#8 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#49 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsi.c#8 integrate
.. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#37 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#23 integrate
.. //depot/projects/smpng/sys/dev/jme/if_jme.c#12 integrate
.. //depot/projects/smpng/sys/dev/jme/if_jmevar.h#4 integrate
.. //depot/projects/smpng/sys/dev/mps/mps.c#4 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt.c#31 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#20 integrate
.. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#23 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#74 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#87 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#45 integrate
.. //depot/projects/smpng/sys/dev/ste/if_ste.c#9 integrate
.. //depot/projects/smpng/sys/dev/txp/if_txp.c#42 integrate
.. //depot/projects/smpng/sys/dev/usb/input/atp.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_process.h#8 integrate
.. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdcache.c#4 integrate
.. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#18 integrate
.. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#14 integrate
.. //depot/projects/smpng/sys/geom/nop/g_nop.c#12 integrate
.. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#43 integrate
.. //depot/projects/smpng/sys/geom/sched/g_sched.c#3 integrate
.. //depot/projects/smpng/sys/geom/sched/gs_rr.c#2 integrate
.. //depot/projects/smpng/sys/i386/i386/apic_vector.s#29 integrate
.. //depot/projects/smpng/sys/kern/kern_clocksource.c#6 integrate
.. //depot/projects/smpng/sys/kern/kern_et.c#4 integrate
.. //depot/projects/smpng/sys/kern/kern_mib.c#49 integrate
.. //depot/projects/smpng/sys/kern/kern_sx.c#65 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#114 integrate
.. //depot/projects/smpng/sys/kern/subr_kobj.c#10 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#65 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#185 integrate
.. //depot/projects/smpng/sys/mips/include/_types.h#4 integrate
.. //depot/projects/smpng/sys/mips/include/cpufunc.h#8 integrate
.. //depot/projects/smpng/sys/mips/include/md_var.h#7 integrate
.. //depot/projects/smpng/sys/mips/include/param.h#12 integrate
.. //depot/projects/smpng/sys/mips/include/pmap.h#20 integrate
.. //depot/projects/smpng/sys/mips/include/proc.h#4 integrate
.. //depot/projects/smpng/sys/mips/include/pte.h#8 integrate
.. //depot/projects/smpng/sys/mips/mips/dump_machdep.c#4 integrate
.. //depot/projects/smpng/sys/mips/mips/exception.S#9 integrate
.. //depot/projects/smpng/sys/mips/mips/machdep.c#21 integrate
.. //depot/projects/smpng/sys/mips/mips/pmap.c#28 integrate
.. //depot/projects/smpng/sys/mips/mips/swtch.S#7 integrate
.. //depot/projects/smpng/sys/mips/mips/trap.c#12 integrate
.. //depot/projects/smpng/sys/mips/rmi/xlr_machdep.c#9 integrate
.. //depot/projects/smpng/sys/net/if.c#140 integrate
.. //depot/projects/smpng/sys/net/netisr.c#24 integrate
.. //depot/projects/smpng/sys/net/route.c#58 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_amrr.c#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#27 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/common/ng_bluetooth.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#23 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#23 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#21 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#21 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#52 integrate
.. //depot/projects/smpng/sys/netinet/cc/cc_htcp.c#2 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#88 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_dn_io.c#5 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#13 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_dynamic.c#6 integrate
.. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#27 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#128 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#81 integrate
.. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#16 integrate
.. //depot/projects/smpng/sys/powerpc/aim/trap.c#15 integrate
.. //depot/projects/smpng/sys/powerpc/include/spr.h#22 integrate
.. //depot/projects/smpng/sys/rpc/svc.c#6 integrate
.. //depot/projects/smpng/sys/security/mac/mac_framework.c#10 integrate
.. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#18 integrate
.. //depot/projects/smpng/sys/sys/param.h#168 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#69 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#85 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#45 integrate
.. //depot/projects/smpng/sys/x86/x86/busdma_machdep.c#2 integrate
.. //depot/projects/smpng/sys/x86/x86/local_apic.c#11 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.27 2010/11/10 18:50:12 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.28 2011/01/12 19:54:19 mdf Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -68,7 +68,7 @@
if (intr_model != ACPI_INTR_PIC)
acpi_SetIntrModel(intr_model);
- SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
+ SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx,
SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
"reset_video", CTLFLAG_RW, &acpi_reset_video, 0,
"Call the VESA reset BIOS vector on the resume path");
==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#22 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.118 2010/11/01 18:18:46 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.119 2011/01/13 17:00:22 jhb Exp $
*/
/*
@@ -58,17 +58,15 @@
FAKE_MCOUNT(TF_RIP(%rsp)) ; \
movq lapic, %rdx ; /* pointer to local APIC */ \
movl LA_ISR + 16 * (index)(%rdx), %eax ; /* load ISR */ \
- bsrl %eax, %eax ; /* index of highset set bit in ISR */ \
- jz 2f ; \
+ bsrl %eax, %eax ; /* index of highest set bit in ISR */ \
+ jz 1f ; \
addl $(32 * index),%eax ; \
-1: ; \
movq %rsp, %rsi ; \
movl %eax, %edi ; /* pass the IRQ */ \
call lapic_handle_intr ; \
+1: ; \
MEXITCOUNT ; \
- jmp doreti ; \
-2: movl $-1, %eax ; /* send a vector of -1 */ \
- jmp 1b
+ jmp doreti
/*
* Handle "spurious INTerrupts".
==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#17 (text+ko) ====
==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#8 (text+ko) ====
==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 (text+ko) ====
==== //depot/projects/smpng/sys/ddb/db_capture.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.6 2008/04/25 13:23:36 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.7 2011/01/12 19:54:19 mdf Exp $");
#include "opt_ddb.h"
@@ -90,7 +90,7 @@
&db_capture_maxbufsize, 0,
"Maximum value for debug.ddb.capture.bufsize");
-SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
+SYSCTL_INT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
&db_capture_inprogress, 0, "DDB output capture in progress");
/*
==== //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#18 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.24 2010/06/11 19:53:42 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.25 2011/01/12 19:53:56 mdf Exp $");
/*
* Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops.
@@ -367,7 +367,7 @@
IBM_NAME_EVENTS_MASK_GET, &sc->events_initialmask));
if (sc->events_mask_supported) {
- SYSCTL_ADD_INT(sc->sysctl_ctx,
+ SYSCTL_ADD_UINT(sc->sysctl_ctx,
SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
"initialmask", CTLFLAG_RD,
&sc->events_initialmask, 0, "Initial eventmask");
@@ -377,7 +377,7 @@
IBM_NAME_EVENTS_AVAILMASK, &sc->events_availmask)))
sc->events_availmask = 0xffffffff;
- SYSCTL_ADD_INT(sc->sysctl_ctx,
+ SYSCTL_ADD_UINT(sc->sysctl_ctx,
SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
"availmask", CTLFLAG_RD,
&sc->events_availmask, 0, "Mask of supported events");
==== //depot/projects/smpng/sys/dev/ae/if_ae.c#12 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.13 2011/01/03 18:28:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.14 2011/01/12 19:53:56 mdf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -207,43 +207,6 @@
#define AE_TXD_VLAN(vtag) \
(((vtag) << 4) | (((vtag) >> 13) & 0x07) | (((vtag) >> 9) & 0x08))
-/*
- * ae statistics.
- */
-#define STATS_ENTRY(node, desc, field) \
- { node, desc, offsetof(struct ae_stats, field) }
-struct {
- const char *node;
- const char *desc;
- intptr_t offset;
-} ae_stats_tx[] = {
- STATS_ENTRY("bcast", "broadcast frames", tx_bcast),
- STATS_ENTRY("mcast", "multicast frames", tx_mcast),
- STATS_ENTRY("pause", "PAUSE frames", tx_pause),
- STATS_ENTRY("control", "control frames", tx_ctrl),
- STATS_ENTRY("defers", "deferrals occuried", tx_defer),
- STATS_ENTRY("exc_defers", "excessive deferrals occuried", tx_excdefer),
- STATS_ENTRY("singlecols", "single collisions occuried", tx_singlecol),
- STATS_ENTRY("multicols", "multiple collisions occuried", tx_multicol),
- STATS_ENTRY("latecols", "late collisions occuried", tx_latecol),
- STATS_ENTRY("aborts", "transmit aborts due collisions", tx_abortcol),
- STATS_ENTRY("underruns", "Tx FIFO underruns", tx_underrun)
-}, ae_stats_rx[] = {
- STATS_ENTRY("bcast", "broadcast frames", rx_bcast),
- STATS_ENTRY("mcast", "multicast frames", rx_mcast),
- STATS_ENTRY("pause", "PAUSE frames", rx_pause),
- STATS_ENTRY("control", "control frames", rx_ctrl),
- STATS_ENTRY("crc_errors", "frames with CRC errors", rx_crcerr),
- STATS_ENTRY("code_errors", "frames with invalid opcode", rx_codeerr),
- STATS_ENTRY("runt", "runt frames", rx_runt),
- STATS_ENTRY("frag", "fragmented frames", rx_frag),
- STATS_ENTRY("align_errors", "frames with alignment errors", rx_align),
- STATS_ENTRY("truncated", "frames truncated due to Rx FIFO inderrun",
- rx_trunc)
-};
-#define AE_STATS_RX_LEN (sizeof(ae_stats_rx) / sizeof(*ae_stats_rx))
-#define AE_STATS_TX_LEN (sizeof(ae_stats_tx) / sizeof(*ae_stats_tx))
-
static int
ae_probe(device_t dev)
{
@@ -433,13 +396,15 @@
return (error);
}
+#define AE_SYSCTL(stx, parent, name, desc, ptr) \
+ SYSCTL_ADD_UINT(ctx, parent, OID_AUTO, name, CTLFLAG_RD, ptr, 0, desc)
+
static void
ae_init_tunables(ae_softc_t *sc)
{
struct sysctl_ctx_list *ctx;
struct sysctl_oid *root, *stats, *stats_rx, *stats_tx;
struct ae_stats *ae_stats;
- unsigned int i;
KASSERT(sc != NULL, ("[ae, %d]: sc is NULL", __LINE__));
ae_stats = &sc->stats;
@@ -454,20 +419,54 @@
*/
stats_rx = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(stats), OID_AUTO, "rx",
CTLFLAG_RD, NULL, "Rx MAC statistics");
- for (i = 0; i < AE_STATS_RX_LEN; i++)
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(stats_rx), OID_AUTO,
- ae_stats_rx[i].node, CTLFLAG_RD, (char *)ae_stats +
- ae_stats_rx[i].offset, 0, ae_stats_rx[i].desc);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "bcast",
+ "broadcast frames", &ae_stats->rx_bcast);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "mcast",
+ "multicast frames", &ae_stats->rx_mcast);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "pause",
+ "PAUSE frames", &ae_stats->rx_pause);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "control",
+ "control frames", &ae_stats->rx_ctrl);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "crc_errors",
+ "frames with CRC errors", &ae_stats->rx_crcerr);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "code_errors",
+ "frames with invalid opcode", &ae_stats->rx_codeerr);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "runt",
+ "runt frames", &ae_stats->rx_runt);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "frag",
+ "fragmented frames", &ae_stats->rx_frag);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "align_errors",
+ "frames with alignment errors", &ae_stats->rx_align);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "truncated",
+ "frames truncated due to Rx FIFO inderrun", &ae_stats->rx_trunc);
/*
* Receiver statistcics.
*/
stats_tx = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(stats), OID_AUTO, "tx",
CTLFLAG_RD, NULL, "Tx MAC statistics");
- for (i = 0; i < AE_STATS_TX_LEN; i++)
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(stats_tx), OID_AUTO,
- ae_stats_tx[i].node, CTLFLAG_RD, (char *)ae_stats +
- ae_stats_tx[i].offset, 0, ae_stats_tx[i].desc);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "bcast",
+ "broadcast frames", &ae_stats->tx_bcast);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "mcast",
+ "multicast frames", &ae_stats->tx_mcast);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "pause",
+ "PAUSE frames", &ae_stats->tx_pause);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "control",
+ "control frames", &ae_stats->tx_ctrl);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "defers",
+ "deferrals occuried", &ae_stats->tx_defer);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "exc_defers",
+ "excessive deferrals occuried", &ae_stats->tx_excdefer);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "singlecols",
+ "single collisions occuried", &ae_stats->tx_singlecol);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "multicols",
+ "multiple collisions occuried", &ae_stats->tx_multicol);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "latecols",
+ "late collisions occuried", &ae_stats->tx_latecol);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "aborts",
+ "transmit aborts due collisions", &ae_stats->tx_abortcol);
+ AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "underruns",
+ "Tx FIFO underruns", &ae_stats->tx_underrun);
}
static void
==== //depot/projects/smpng/sys/dev/age/if_age.c#15 (text+ko) ====
@@ -28,7 +28,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.17 2011/01/03 18:28:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.18 2011/01/13 13:04:49 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1760,8 +1760,6 @@
/* Set a timeout in case the chip goes out to lunch. */
sc->age_watchdog_timer = AGE_TX_TIMEOUT;
}
-
- AGE_UNLOCK(sc);
}
static void
==== //depot/projects/smpng/sys/dev/alc/if_alc.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
/* Driver for Atheros AR813x/AR815x PCIe Ethernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.24 2011/01/03 18:28:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.26 2011/01/12 22:24:07 yongari Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1106,7 +1106,7 @@
#define ALC_SYSCTL_STAT_ADD32(c, h, n, p, d) \
SYSCTL_ADD_UINT(c, h, OID_AUTO, n, CTLFLAG_RD, p, 0, d)
#define ALC_SYSCTL_STAT_ADD64(c, h, n, p, d) \
- SYSCTL_ADD_QUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d)
+ SYSCTL_ADD_UQUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d)
static void
alc_sysctl_node(struct alc_softc *sc)
@@ -2706,7 +2706,7 @@
}
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0 &&
!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
- alc_start_locked(ifp);
+ alc_start(ifp);
}
if (more == EAGAIN ||
==== //depot/projects/smpng/sys/dev/ale/if_ale.c#10 (text+ko) ====
@@ -28,7 +28,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.14 2011/01/03 18:28:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.15 2011/01/12 19:53:56 mdf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -729,7 +729,10 @@
#define ALE_SYSCTL_STAT_ADD32(c, h, n, p, d) \
SYSCTL_ADD_UINT(c, h, OID_AUTO, n, CTLFLAG_RD, p, 0, d)
-#if __FreeBSD_version > 800000
+#if __FreeBSD_version >= 900030
+#define ALE_SYSCTL_STAT_ADD64(c, h, n, p, d) \
+ SYSCTL_ADD_UQUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d)
+#elif __FreeBSD_version > 800000
#define ALE_SYSCTL_STAT_ADD64(c, h, n, p, d) \
SYSCTL_ADD_QUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d)
#else
==== //depot/projects/smpng/sys/dev/ath/if_ath.c#91 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.278 2010/08/14 14:18:02 adrian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.279 2011/01/12 19:53:56 mdf Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -6565,10 +6565,10 @@
struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
struct ath_hal *ah = sc->sc_ah;
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"countrycode", CTLFLAG_RD, &sc->sc_eecc, 0,
"EEPROM country code");
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"regdomain", CTLFLAG_RD, &sc->sc_eerd, 0,
"EEPROM regdomain code");
#ifdef ATH_DEBUG
@@ -6591,10 +6591,10 @@
SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"ledpin", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
ath_sysctl_ledpin, "I", "GPIO pin connected to LED");
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"ledon", CTLFLAG_RW, &sc->sc_ledon, 0,
"setting to turn LED on");
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"ledidle", CTLFLAG_RW, &sc->sc_ledidle, 0,
"idle time for inactivity LED (ticks)");
SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
@@ -6608,7 +6608,7 @@
"diversity", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
ath_sysctl_diversity, "I", "antenna diversity");
sc->sc_txintrperiod = ATH_TXINTR_PERIOD;
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"txintrperiod", CTLFLAG_RW, &sc->sc_txintrperiod, 0,
"tx descriptor batching");
SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
@@ -6642,7 +6642,7 @@
ath_sysctl_intmit, "I", "interference mitigation");
}
sc->sc_monpass = HAL_RXERR_DECRYPT | HAL_RXERR_MIC;
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"monpass", CTLFLAG_RW, &sc->sc_monpass, 0,
"mask of error frames to pass when monitoring");
#ifdef IEEE80211_SUPPORT_TDMA
==== //depot/projects/smpng/sys/dev/bce/if_bce.c#41 (text) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.84 2010/11/14 13:26:10 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.85 2011/01/12 19:53:56 mdf Exp $");
/*
* The following controllers are supported by this driver:
@@ -507,14 +507,14 @@
/* Allowable values are TRUE or FALSE */
static int bce_tso_enable = TRUE;
TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable);
-SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0,
+SYSCTL_INT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0,
"TSO Enable/Disable");
/* Allowable values are 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */
/* ToDo: Add MSI-X support. */
static int bce_msi_enable = 1;
TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable);
-SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0,
+SYSCTL_INT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0,
"MSI-X|MSI|INTx selector");
/* ToDo: Add tunable to enable/disable strict MTU handling. */
@@ -8487,7 +8487,7 @@
0, "Number of simulated l2_fhdr errors");
#endif
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"l2fhdr_error_count",
CTLFLAG_RD, &sc->l2fhdr_error_count,
0, "Number of l2_fhdr errors");
@@ -8498,18 +8498,18 @@
CTLFLAG_RW, &mbuf_alloc_failed_sim_control,
0, "Debug control to force mbuf allocation failures");
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"mbuf_alloc_failed_sim_count",
CTLFLAG_RD, &sc->mbuf_alloc_failed_sim_count,
0, "Number of simulated mbuf cluster allocation failures");
#endif
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"mbuf_alloc_failed_count",
CTLFLAG_RD, &sc->mbuf_alloc_failed_count,
0, "Number of mbuf allocation failures");
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"mbuf_frag_count",
CTLFLAG_RD, &sc->mbuf_frag_count,
0, "Number of fragmented mbufs");
@@ -8521,19 +8521,19 @@
0, "Debug control to force DMA mapping failures");
/* ToDo: Figure out how to update this value in bce_dma_map_addr(). */
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"dma_map_addr_failed_sim_count",
CTLFLAG_RD, &sc->dma_map_addr_failed_sim_count,
0, "Number of simulated DMA mapping failures");
#endif
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"dma_map_addr_rx_failed_count",
CTLFLAG_RD, &sc->dma_map_addr_rx_failed_count,
0, "Number of RX DMA mapping failures");
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"dma_map_addr_tx_failed_count",
CTLFLAG_RD, &sc->dma_map_addr_tx_failed_count,
0, "Number of TX DMA mapping failures");
@@ -8544,13 +8544,13 @@
CTLFLAG_RW, &unexpected_attention_sim_control,
0, "Debug control to simulate unexpected attentions");
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"unexpected_attention_sim_count",
CTLFLAG_RW, &sc->unexpected_attention_sim_count,
0, "Number of simulated unexpected attentions");
#endif
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"unexpected_attention_count",
CTLFLAG_RW, &sc->unexpected_attention_count,
0, "Number of unexpected attentions");
==== //depot/projects/smpng/sys/dev/bge/if_bge.c#122 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.339 2011/01/10 17:45:09 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.340 2011/01/12 19:53:56 mdf Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -5546,7 +5546,7 @@
#undef BGE_SYSCTL_STAT
#define BGE_SYSCTL_STAT_ADD64(c, h, n, p, d) \
- SYSCTL_ADD_QUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d)
+ SYSCTL_ADD_UQUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d)
static void
bge_add_sysctl_stats_regs(struct bge_softc *sc, struct sysctl_ctx_list *ctx,
==== //depot/projects/smpng/sys/dev/bwi/if_bwi.c#11 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.16 2010/11/06 18:17:20 bschmidt Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.17 2011/01/12 19:53:56 mdf Exp $");
#include "opt_inet.h"
#include "opt_bwi.h"
@@ -537,11 +537,11 @@
/*
* Add sysctl nodes
*/
- SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
"fw_version", CTLFLAG_RD, &sc->sc_fw_version, 0,
"Firmware version");
- SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
"led_idle", CTLFLAG_RW, &sc->sc_led_idle, 0,
"# ticks before LED enters idle state");
==== //depot/projects/smpng/sys/dev/bwn/if_bwn.c#11 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.24 2010/12/06 10:24:06 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.25 2011/01/12 19:53:56 mdf Exp $");
/*
* The Broadcom Wireless LAN controller driver.
@@ -14211,13 +14211,13 @@
return;
stats = &mac->mac_stats;
- SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
"linknoise", CTLFLAG_RW, &stats->rts, 0, "Noise level");
- SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
"rts", CTLFLAG_RW, &stats->rts, 0, "RTS");
- SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
"rtsfail", CTLFLAG_RW, &stats->rtsfail, 0, "RTS failed to send");
==== //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#36 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.118 2010/08/15 20:34:51 np Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.119 2011/01/12 19:53:44 mdf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -195,7 +195,7 @@
TUNABLE_INT("hw.cxgb.msi_allowed", &msi_allowed);
SYSCTL_NODE(_hw, OID_AUTO, cxgb, CTLFLAG_RD, 0, "CXGB driver parameters");
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0,
"MSI-X, MSI, INTx selector");
/*
@@ -204,7 +204,7 @@
*/
static int ofld_disable = 0;
TUNABLE_INT("hw.cxgb.ofld_disable", &ofld_disable);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, ofld_disable, CTLFLAG_RDTUN, &ofld_disable, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, ofld_disable, CTLFLAG_RDTUN, &ofld_disable, 0,
"disable ULP offload");
/*
@@ -213,7 +213,7 @@
*/
static int multiq = 1;
TUNABLE_INT("hw.cxgb.multiq", &multiq);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, multiq, CTLFLAG_RDTUN, &multiq, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, multiq, CTLFLAG_RDTUN, &multiq, 0,
"use min(ncpus/ports, 8) queue-sets per port");
/*
@@ -223,7 +223,7 @@
*/
static int force_fw_update = 0;
TUNABLE_INT("hw.cxgb.force_fw_update", &force_fw_update);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, force_fw_update, CTLFLAG_RDTUN, &force_fw_update, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, force_fw_update, CTLFLAG_RDTUN, &force_fw_update, 0,
"update firmware even if up to date");
int cxgb_use_16k_clusters = -1;
@@ -236,7 +236,7 @@
*/
int cxgb_snd_queue_len = IFQ_MAXLEN;
TUNABLE_INT("hw.cxgb.snd_queue_len", &cxgb_snd_queue_len);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, snd_queue_len, CTLFLAG_RDTUN,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, snd_queue_len, CTLFLAG_RDTUN,
&cxgb_snd_queue_len, 0, "send queue size ");
static int nfilters = -1;
==== //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#30 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.95 2010/09/16 16:13:12 mdf Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.96 2011/01/12 19:53:44 mdf Exp $");
#include "opt_inet.h"
@@ -79,12 +79,12 @@
extern struct sysctl_oid_list sysctl__hw_cxgb_children;
int cxgb_txq_buf_ring_size = TX_ETH_Q_SIZE;
TUNABLE_INT("hw.cxgb.txq_mr_size", &cxgb_txq_buf_ring_size);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, txq_mr_size, CTLFLAG_RDTUN, &cxgb_txq_buf_ring_size, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, txq_mr_size, CTLFLAG_RDTUN, &cxgb_txq_buf_ring_size, 0,
"size of per-queue mbuf ring");
static int cxgb_tx_coalesce_force = 0;
TUNABLE_INT("hw.cxgb.tx_coalesce_force", &cxgb_tx_coalesce_force);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce_force, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_force, CTLFLAG_RW,
&cxgb_tx_coalesce_force, 0,
"coalesce small packets into a single work request regardless of ring state");
@@ -100,17 +100,17 @@
static int cxgb_tx_coalesce_enable_start = COALESCE_START_DEFAULT;
TUNABLE_INT("hw.cxgb.tx_coalesce_enable_start",
&cxgb_tx_coalesce_enable_start);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_start, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_start, CTLFLAG_RW,
&cxgb_tx_coalesce_enable_start, 0,
"coalesce enable threshold");
static int cxgb_tx_coalesce_enable_stop = COALESCE_STOP_DEFAULT;
TUNABLE_INT("hw.cxgb.tx_coalesce_enable_stop", &cxgb_tx_coalesce_enable_stop);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_stop, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_stop, CTLFLAG_RW,
&cxgb_tx_coalesce_enable_stop, 0,
"coalesce disable threshold");
static int cxgb_tx_reclaim_threshold = TX_RECLAIM_DEFAULT;
TUNABLE_INT("hw.cxgb.tx_reclaim_threshold", &cxgb_tx_reclaim_threshold);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_reclaim_threshold, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_reclaim_threshold, CTLFLAG_RW,
&cxgb_tx_reclaim_threshold, 0,
"tx cleaning minimum threshold");
@@ -3493,7 +3493,7 @@
"firmware_version",
CTLFLAG_RD, &sc->fw_version,
0, "firmware version");
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"hw_revision",
CTLFLAG_RD, &sc->params.rev,
0, "chip model");
@@ -3505,14 +3505,14 @@
"enable_debug",
CTLFLAG_RW, &cxgb_debug,
0, "enable verbose debugging output");
- SYSCTL_ADD_QUAD(ctx, children, OID_AUTO, "tunq_coalesce",
+ SYSCTL_ADD_UQUAD(ctx, children, OID_AUTO, "tunq_coalesce",
CTLFLAG_RD, &sc->tunq_coalesce,
"#tunneled packets freed");
SYSCTL_ADD_INT(ctx, children, OID_AUTO,
"txq_overrun",
CTLFLAG_RD, &txq_fills,
0, "#times txq overrun");
- SYSCTL_ADD_INT(ctx, children, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"core_clock",
CTLFLAG_RD, &sc->params.vpd.cclk,
0, "core clock frequency (in KHz)");
@@ -3576,7 +3576,7 @@
poid = SYSCTL_ADD_NODE(ctx, children, OID_AUTO,
pi->namebuf, CTLFLAG_RD, NULL, "port statistics");
poidlist = SYSCTL_CHILDREN(poid);
- SYSCTL_ADD_INT(ctx, poidlist, OID_AUTO,
+ SYSCTL_ADD_UINT(ctx, poidlist, OID_AUTO,
"nqsets", CTLFLAG_RD, &pi->nqsets,
0, "#queue sets");
@@ -3643,10 +3643,10 @@
CTLTYPE_STRING | CTLFLAG_RD, &qs->rspq,
0, t3_dump_rspq, "A", "dump of the response queue");
- SYSCTL_ADD_QUAD(ctx, txqpoidlist, OID_AUTO, "dropped",
+ SYSCTL_ADD_UQUAD(ctx, txqpoidlist, OID_AUTO, "dropped",
CTLFLAG_RD, &qs->txq[TXQ_ETH].txq_mr->br_drops,
"#tunneled packets dropped");
- SYSCTL_ADD_INT(ctx, txqpoidlist, OID_AUTO, "sendqlen",
+ SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "sendqlen",
CTLFLAG_RD, &qs->txq[TXQ_ETH].sendq.qlen,
0, "#tunneled packets waiting to be sent");
#if 0
@@ -3657,7 +3657,7 @@
CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.br_cons,
0, "#tunneled packets queue consumer index");
#endif
- SYSCTL_ADD_INT(ctx, txqpoidlist, OID_AUTO, "processed",
+ SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "processed",
CTLFLAG_RD, &qs->txq[TXQ_ETH].processed,
0, "#tunneled packets processed by the card");
SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "cleaned",
@@ -3672,7 +3672,7 @@
SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "skipped",
CTLFLAG_RD, &txq->txq_skipped,
0, "#tunneled packet descriptors skipped");
- SYSCTL_ADD_QUAD(ctx, txqpoidlist, OID_AUTO, "coalesced",
+ SYSCTL_ADD_UQUAD(ctx, txqpoidlist, OID_AUTO, "coalesced",
CTLFLAG_RD, &txq->txq_coalesced,
"#tunneled packets coalesced");
SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "enqueued",
==== //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.5 2009/12/22 15:47:40 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.6 2011/01/12 19:53:44 mdf Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,32 +101,32 @@
static int ep_timeout_secs = 10;
TUNABLE_INT("hw.iw_cxgb.ep_timeout_secs", &ep_timeout_secs);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, ep_timeout_secs, CTLFLAG_RDTUN, &ep_timeout_secs, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, ep_timeout_secs, CTLFLAG_RDTUN, &ep_timeout_secs, 0,
"CM Endpoint operation timeout in seconds (default=10)");
static int mpa_rev = 1;
TUNABLE_INT("hw.iw_cxgb.mpa_rev", &mpa_rev);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, mpa_rev, CTLFLAG_RDTUN, &mpa_rev, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, mpa_rev, CTLFLAG_RDTUN, &mpa_rev, 0,
"MPA Revision, 0 supports amso1100, 1 is spec compliant. (default=1)");
static int markers_enabled = 0;
TUNABLE_INT("hw.iw_cxgb.markers_enabled", &markers_enabled);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, markers_enabled, CTLFLAG_RDTUN, &markers_enabled, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, markers_enabled, CTLFLAG_RDTUN, &markers_enabled, 0,
"Enable MPA MARKERS (default(0)=disabled)");
static int crc_enabled = 1;
TUNABLE_INT("hw.iw_cxgb.crc_enabled", &crc_enabled);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, crc_enabled, CTLFLAG_RDTUN, &crc_enabled, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, crc_enabled, CTLFLAG_RDTUN, &crc_enabled, 0,
"Enable MPA CRC (default(1)=enabled)");
static int rcv_win = 256 * 1024;
TUNABLE_INT("hw.iw_cxgb.rcv_win", &rcv_win);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, rcv_win, CTLFLAG_RDTUN, &rcv_win, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, rcv_win, CTLFLAG_RDTUN, &rcv_win, 0,
"TCP receive window in bytes (default=256KB)");
static int snd_win = 32 * 1024;
TUNABLE_INT("hw.iw_cxgb.snd_win", &snd_win);
-SYSCTL_UINT(_hw_cxgb, OID_AUTO, snd_win, CTLFLAG_RDTUN, &snd_win, 0,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, snd_win, CTLFLAG_RDTUN, &snd_win, 0,
"TCP send window in bytes (default=32KB)");
static unsigned int nocong = 0;
==== //depot/projects/smpng/sys/dev/e1000/if_em.c#24 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.64 2010/12/04 06:38:21 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.66 2011/01/12 19:53:23 mdf Exp $*/
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -93,7 +93,7 @@
/*********************************************************************
* Driver version:
*********************************************************************/
-char em_driver_version[] = "7.1.8";
+char em_driver_version[] = "7.1.9";
/*********************************************************************
* PCI Device ID Table
@@ -1909,14 +1909,23 @@
error = bus_dmamap_load_mbuf_sg(txr->txtag, map,
*m_headp, segs, &nsegs, BUS_DMA_NOWAIT);
- if (error) {
+ if (error == ENOMEM) {
+ adapter->no_tx_dma_setup++;
+ return (error);
+ } else if (error != 0) {
adapter->no_tx_dma_setup++;
m_freem(*m_headp);
*m_headp = NULL;
return (error);
}
+
+ } else if (error == ENOMEM) {
+ adapter->no_tx_dma_setup++;
+ return (error);
} else if (error != 0) {
adapter->no_tx_dma_setup++;
+ m_freem(*m_headp);
+ *m_headp = NULL;
return (error);
}
@@ -2206,7 +2215,6 @@
txr->me, txr->tx_avail, txr->next_to_clean);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
adapter->watchdog_events++;
- EM_TX_UNLOCK(txr);
em_init_locked(adapter);
}
@@ -5051,8 +5059,8 @@
char namebuf[QUEUE_NAME_LEN];
/* Driver Statistics */
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "link_irq",
- CTLFLAG_RD, &adapter->link_irq, 0,
+ SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_irq",
+ CTLFLAG_RD, &adapter->link_irq,
"Link MSIX IRQ Handled");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "mbuf_alloc_fail",
CTLFLAG_RD, &adapter->mbuf_alloc_failed,
@@ -5128,147 +5136,147 @@
CTLFLAG_RD, NULL, "Statistics");
stat_list = SYSCTL_CHILDREN(stat_node);
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "excess_coll",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "excess_coll",
CTLFLAG_RD, &stats->ecol,
"Excessive collisions");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "single_coll",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "single_coll",
CTLFLAG_RD, &stats->scc,
"Single collisions");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "multiple_coll",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "multiple_coll",
CTLFLAG_RD, &stats->mcc,
"Multiple collisions");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "late_coll",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "late_coll",
CTLFLAG_RD, &stats->latecol,
"Late collisions");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "collision_count",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "collision_count",
CTLFLAG_RD, &stats->colc,
"Collision Count");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "symbol_errors",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "symbol_errors",
CTLFLAG_RD, &adapter->stats.symerrs,
"Symbol Errors");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "sequence_errors",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "sequence_errors",
CTLFLAG_RD, &adapter->stats.sec,
"Sequence Errors");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "defer_count",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "defer_count",
CTLFLAG_RD, &adapter->stats.dc,
"Defer Count");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "missed_packets",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "missed_packets",
CTLFLAG_RD, &adapter->stats.mpc,
"Missed Packets");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "recv_no_buff",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_no_buff",
CTLFLAG_RD, &adapter->stats.rnbc,
"Receive No Buffers");
- SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "recv_undersize",
+ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_undersize",
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list