From owner-svn-src-projects@FreeBSD.ORG Wed May 16 07:18:56 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4732106566C; Wed, 16 May 2012 07:18:56 +0000 (UTC) (envelope-from gber@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BBCD78FC08; Wed, 16 May 2012 07:18:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4G7IusF028142; Wed, 16 May 2012 07:18:56 GMT (envelope-from gber@svn.freebsd.org) Received: (from gber@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4G7IuNJ028125; Wed, 16 May 2012 07:18:56 GMT (envelope-from gber@svn.freebsd.org) Message-Id: <201205160718.q4G7IuNJ028125@svn.freebsd.org> From: Grzegorz Bernacki Date: Wed, 16 May 2012 07:18:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235501 - in projects/nand: . bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common contrib/top gnu/lib/libgcc lib/libcompiler_rt share/examples/csh share... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2012 07:18:56 -0000 Author: gber Date: Wed May 16 07:18:56 2012 New Revision: 235501 URL: http://svn.freebsd.org/changeset/base/235501 Log: IFC @235500 Modified: projects/nand/Makefile.inc1 projects/nand/bin/sh/miscbltin.c projects/nand/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/nand/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/nand/gnu/lib/libgcc/Makefile projects/nand/lib/libcompiler_rt/Makefile projects/nand/share/examples/csh/dot.cshrc projects/nand/sys/dev/ath/if_ath_debug.c projects/nand/sys/dev/ath/if_ath_debug.h projects/nand/sys/dev/ath/if_ath_sysctl.c projects/nand/sys/dev/ath/if_ath_tx.c projects/nand/sys/dev/ath/if_athvar.h projects/nand/sys/kern/sched_4bsd.c projects/nand/sys/netinet/tcp_lro.c projects/nand/sys/netinet/tcp_lro.h projects/nand/usr.sbin/wpa/hostapd/hostapd.conf.5 Directory Properties: projects/nand/ (props changed) projects/nand/MAINTAINERS (props changed) projects/nand/cddl/contrib/opensolaris/ (props changed) projects/nand/contrib/bind9/ (props changed) projects/nand/contrib/binutils/ (props changed) projects/nand/contrib/bzip2/ (props changed) projects/nand/contrib/com_err/ (props changed) projects/nand/contrib/compiler-rt/ (props changed) projects/nand/contrib/dialog/ (props changed) projects/nand/contrib/ee/ (props changed) projects/nand/contrib/expat/ (props changed) projects/nand/contrib/file/ (props changed) projects/nand/contrib/gcc/ (props changed) projects/nand/contrib/gdb/ (props changed) projects/nand/contrib/gdtoa/ (props changed) projects/nand/contrib/gnu-sort/ (props changed) projects/nand/contrib/groff/ (props changed) projects/nand/contrib/less/ (props changed) projects/nand/contrib/libarchive/ (props changed) projects/nand/contrib/libarchive/cpio/ (props changed) projects/nand/contrib/libarchive/libarchive/ (props changed) projects/nand/contrib/libarchive/libarchive_fe/ (props changed) projects/nand/contrib/libarchive/tar/ (props changed) projects/nand/contrib/libc++/ (props changed) projects/nand/contrib/libcxxrt/ (props changed) projects/nand/contrib/libpcap/ (props changed) projects/nand/contrib/libstdc++/ (props changed) projects/nand/contrib/llvm/ (props changed) projects/nand/contrib/llvm/tools/clang/ (props changed) projects/nand/contrib/ncurses/ (props changed) projects/nand/contrib/netcat/ (props changed) projects/nand/contrib/ntp/ (props changed) projects/nand/contrib/one-true-awk/ (props changed) projects/nand/contrib/openbsm/ (props changed) projects/nand/contrib/openpam/ (props changed) projects/nand/contrib/openresolv/ (props changed) projects/nand/contrib/pf/ (props changed) projects/nand/contrib/sendmail/ (props changed) projects/nand/contrib/tcpdump/ (props changed) projects/nand/contrib/tcsh/ (props changed) projects/nand/contrib/tnftp/ (props changed) projects/nand/contrib/top/ (props changed) projects/nand/contrib/top/install-sh (props changed) projects/nand/contrib/tzcode/stdtime/ (props changed) projects/nand/contrib/tzcode/zic/ (props changed) projects/nand/contrib/tzdata/ (props changed) projects/nand/contrib/wpa/ (props changed) projects/nand/contrib/xz/ (props changed) projects/nand/crypto/heimdal/ (props changed) projects/nand/crypto/openssh/ (props changed) projects/nand/crypto/openssl/ (props changed) projects/nand/gnu/lib/ (props changed) projects/nand/gnu/usr.bin/binutils/ (props changed) projects/nand/gnu/usr.bin/cc/cc_tools/ (props changed) projects/nand/gnu/usr.bin/gdb/ (props changed) projects/nand/lib/libc/ (props changed) projects/nand/lib/libc/stdtime/ (props changed) projects/nand/lib/libutil/ (props changed) projects/nand/lib/libz/ (props changed) projects/nand/sbin/ (props changed) projects/nand/sbin/ipfw/ (props changed) projects/nand/share/man/man4/ (props changed) projects/nand/share/mk/bsd.arch.inc.mk (props changed) projects/nand/share/zoneinfo/ (props changed) projects/nand/sys/ (props changed) projects/nand/sys/amd64/include/xen/ (props changed) projects/nand/sys/boot/ (props changed) projects/nand/sys/boot/i386/efi/ (props changed) projects/nand/sys/boot/ia64/efi/ (props changed) projects/nand/sys/boot/ia64/ski/ (props changed) projects/nand/sys/boot/powerpc/boot1.chrp/ (props changed) projects/nand/sys/boot/powerpc/ofw/ (props changed) projects/nand/sys/cddl/contrib/opensolaris/ (props changed) projects/nand/sys/conf/ (props changed) projects/nand/sys/contrib/dev/acpica/ (props changed) projects/nand/sys/contrib/dev/acpica/changes.txt (props changed) projects/nand/sys/contrib/dev/acpica/common/ (props changed) projects/nand/sys/contrib/dev/acpica/compiler/ (props changed) projects/nand/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/nand/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/nand/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/nand/sys/contrib/dev/acpica/components/events/ (props changed) projects/nand/sys/contrib/dev/acpica/components/executer/ (props changed) projects/nand/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/nand/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/nand/sys/contrib/dev/acpica/components/parser/ (props changed) projects/nand/sys/contrib/dev/acpica/components/resources/ (props changed) projects/nand/sys/contrib/dev/acpica/components/tables/ (props changed) projects/nand/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/nand/sys/contrib/dev/acpica/include/ (props changed) projects/nand/sys/contrib/dev/acpica/os_specific/ (props changed) projects/nand/sys/contrib/octeon-sdk/ (props changed) projects/nand/sys/contrib/pf/ (props changed) projects/nand/sys/contrib/x86emu/ (props changed) projects/nand/sys/i386/conf/XENHVM (props changed) projects/nand/usr.bin/calendar/ (props changed) projects/nand/usr.bin/csup/ (props changed) projects/nand/usr.bin/procstat/ (props changed) projects/nand/usr.sbin/jail/ (props changed) projects/nand/usr.sbin/ndiscvt/ (props changed) projects/nand/usr.sbin/rtadvctl/ (props changed) projects/nand/usr.sbin/rtadvd/ (props changed) projects/nand/usr.sbin/rtsold/ (props changed) projects/nand/usr.sbin/zic/ (props changed) Modified: projects/nand/Makefile.inc1 ============================================================================== --- projects/nand/Makefile.inc1 Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/Makefile.inc1 Wed May 16 07:18:56 2012 (r235501) @@ -978,8 +978,8 @@ update: # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0 - @echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \ +.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \ false .endif .for _tool in tools/build @@ -1007,6 +1007,10 @@ _gperf= gnu/usr.bin/gperf _groff= gnu/usr.bin/groff .endif +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 900002 _sed= usr.bin/sed .endif @@ -1020,7 +1024,7 @@ _yacc= usr.bin/yacc _awk= usr.bin/awk .endif -.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree) +.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree) _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -1034,7 +1038,9 @@ _clang_tblgen= \ # dtrace tools are required for older bootstrap env and cross-build .if ${MK_CDDL} != "no" && \ - (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}) + ((${BOOTSTRAPPING} < 800038 && \ + !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \ + || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})) _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge .endif @@ -1067,6 +1073,7 @@ bootstrap-tools: ${_awk} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ ${_sed} \ ${_lex} \ @@ -1132,7 +1139,7 @@ build-tools: # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif Modified: projects/nand/bin/sh/miscbltin.c ============================================================================== --- projects/nand/bin/sh/miscbltin.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/bin/sh/miscbltin.c Wed May 16 07:18:56 2012 (r235501) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "shell.h" #include "options.h" Modified: projects/nand/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/nand/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed May 16 07:18:56 2012 (r235501) @@ -1909,7 +1909,7 @@ zpool_do_import(int argc, char **argv) if (searchdirs == NULL) { searchdirs = safe_malloc(sizeof (char *)); - searchdirs[0] = "/dev/dsk"; + searchdirs[0] = "/dev"; nsearch = 1; } Modified: projects/nand/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- projects/nand/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Wed May 16 07:18:56 2012 (r235501) @@ -1145,7 +1145,7 @@ zpool_find_import_impl(libzfs_handle_t * char *end, **dir = iarg->path; size_t pathleft; nvlist_t *ret = NULL; - static char *default_dir = "/dev/dsk"; + static char *default_dir = "/dev"; pool_list_t pools = { 0 }; pool_entry_t *pe, *penext; vdev_entry_t *ve, *venext; Modified: projects/nand/gnu/lib/libgcc/Makefile ============================================================================== --- projects/nand/gnu/lib/libgcc/Makefile Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/gnu/lib/libgcc/Makefile Wed May 16 07:18:56 2012 (r235501) @@ -15,7 +15,7 @@ MK_SSP= no .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" -.if ${TARGET_CPUARCH} == "sparc64" || ${TARGET_CPUARCH} == "mips" +.if ${TARGET_CPUARCH} == "mips" LIB= gcc .endif Modified: projects/nand/lib/libcompiler_rt/Makefile ============================================================================== --- projects/nand/lib/libcompiler_rt/Makefile Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/lib/libcompiler_rt/Makefile Wed May 16 07:18:56 2012 (r235501) @@ -176,7 +176,7 @@ SRCS+= ${file}.c . endif .endfor -.if ${MACHINE_CPUARCH} != "sparc64" && ${MACHINE_CPUARCH} != "mips" +.if ${MACHINE_CPUARCH} != "mips" . if ${MK_INSTALLLIB} != "no" SYMLINKS+=libcompiler_rt.a ${LIBDIR}/libgcc.a . endif Modified: projects/nand/share/examples/csh/dot.cshrc ============================================================================== --- projects/nand/share/examples/csh/dot.cshrc Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/share/examples/csh/dot.cshrc Wed May 16 07:18:56 2012 (r235501) @@ -5,7 +5,7 @@ # Sets SSH_AUTH_SOCK to the user's ssh-agent socket path if running if (${?SSH_AUTH_SOCK} != "1") then - setenv SSH_AUTH_SOCK `sockstat | grep "${USER}" | cut -d ' ' -f 6` + setenv SSH_AUTH_SOCK `sockstat | grep "^${USER} " | awk '/ssh-agent/ { print $6 }'` endif # Change only root's prompt Modified: projects/nand/sys/dev/ath/if_ath_debug.c ============================================================================== --- projects/nand/sys/dev/ath/if_ath_debug.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/dev/ath/if_ath_debug.c Wed May 16 07:18:56 2012 (r235501) @@ -89,12 +89,12 @@ __FBSDID("$FreeBSD$"); #ifdef ATH_DEBUG #include -int ath_debug = 0; +uint64_t ath_debug = 0; SYSCTL_DECL(_hw_ath); -SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, +SYSCTL_QUAD(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, 0, "control debugging printfs"); -TUNABLE_INT("hw.ath.debug", &ath_debug); +TUNABLE_QUAD("hw.ath.debug", &ath_debug); void ath_printrxbuf(struct ath_softc *sc, const struct ath_buf *bf, Modified: projects/nand/sys/dev/ath/if_ath_debug.h ============================================================================== --- projects/nand/sys/dev/ath/if_ath_debug.h Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/dev/ath/if_ath_debug.h Wed May 16 07:18:56 2012 (r235501) @@ -34,39 +34,40 @@ #ifdef ATH_DEBUG enum { - ATH_DEBUG_XMIT = 0x00000001, /* basic xmit operation */ - ATH_DEBUG_XMIT_DESC = 0x00000002, /* xmit descriptors */ - ATH_DEBUG_RECV = 0x00000004, /* basic recv operation */ - ATH_DEBUG_RECV_DESC = 0x00000008, /* recv descriptors */ - ATH_DEBUG_RATE = 0x00000010, /* rate control */ - ATH_DEBUG_RESET = 0x00000020, /* reset processing */ - ATH_DEBUG_MODE = 0x00000040, /* mode init/setup */ - ATH_DEBUG_BEACON = 0x00000080, /* beacon handling */ - ATH_DEBUG_WATCHDOG = 0x00000100, /* watchdog timeout */ - ATH_DEBUG_INTR = 0x00001000, /* ISR */ - ATH_DEBUG_TX_PROC = 0x00002000, /* tx ISR proc */ - ATH_DEBUG_RX_PROC = 0x00004000, /* rx ISR proc */ - ATH_DEBUG_BEACON_PROC = 0x00008000, /* beacon ISR proc */ - ATH_DEBUG_CALIBRATE = 0x00010000, /* periodic calibration */ - ATH_DEBUG_KEYCACHE = 0x00020000, /* key cache management */ - ATH_DEBUG_STATE = 0x00040000, /* 802.11 state transitions */ - ATH_DEBUG_NODE = 0x00080000, /* node management */ - ATH_DEBUG_LED = 0x00100000, /* led management */ - ATH_DEBUG_FF = 0x00200000, /* fast frames */ - ATH_DEBUG_DFS = 0x00400000, /* DFS processing */ - ATH_DEBUG_TDMA = 0x00800000, /* TDMA processing */ - ATH_DEBUG_TDMA_TIMER = 0x01000000, /* TDMA timer processing */ - ATH_DEBUG_REGDOMAIN = 0x02000000, /* regulatory processing */ - ATH_DEBUG_SW_TX = 0x04000000, /* per-packet software TX */ - ATH_DEBUG_SW_TX_BAW = 0x08000000, /* BAW handling */ - ATH_DEBUG_SW_TX_CTRL = 0x10000000, /* queue control */ - ATH_DEBUG_SW_TX_AGGR = 0x20000000, /* aggregate TX */ - ATH_DEBUG_SW_TX_RETRIES = 0x40000000, /* software TX retries */ - ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ - ATH_DEBUG_ANY = 0xffffffff + ATH_DEBUG_XMIT = 0x000000001ULL, /* basic xmit operation */ + ATH_DEBUG_XMIT_DESC = 0x000000002ULL, /* xmit descriptors */ + ATH_DEBUG_RECV = 0x000000004ULL, /* basic recv operation */ + ATH_DEBUG_RECV_DESC = 0x000000008ULL, /* recv descriptors */ + ATH_DEBUG_RATE = 0x000000010ULL, /* rate control */ + ATH_DEBUG_RESET = 0x000000020ULL, /* reset processing */ + ATH_DEBUG_MODE = 0x000000040ULL, /* mode init/setup */ + ATH_DEBUG_BEACON = 0x000000080ULL, /* beacon handling */ + ATH_DEBUG_WATCHDOG = 0x000000100ULL, /* watchdog timeout */ + ATH_DEBUG_INTR = 0x000001000ULL, /* ISR */ + ATH_DEBUG_TX_PROC = 0x000002000ULL, /* tx ISR proc */ + ATH_DEBUG_RX_PROC = 0x000004000ULL, /* rx ISR proc */ + ATH_DEBUG_BEACON_PROC = 0x000008000ULL, /* beacon ISR proc */ + ATH_DEBUG_CALIBRATE = 0x000010000ULL, /* periodic calibration */ + ATH_DEBUG_KEYCACHE = 0x000020000ULL, /* key cache management */ + ATH_DEBUG_STATE = 0x000040000ULL, /* 802.11 state transitions */ + ATH_DEBUG_NODE = 0x000080000ULL, /* node management */ + ATH_DEBUG_LED = 0x000100000ULL, /* led management */ + ATH_DEBUG_FF = 0x000200000ULL, /* fast frames */ + ATH_DEBUG_DFS = 0x000400000ULL, /* DFS processing */ + ATH_DEBUG_TDMA = 0x000800000ULL, /* TDMA processing */ + ATH_DEBUG_TDMA_TIMER = 0x001000000ULL, /* TDMA timer processing */ + ATH_DEBUG_REGDOMAIN = 0x002000000ULL, /* regulatory processing */ + ATH_DEBUG_SW_TX = 0x004000000ULL, /* per-packet software TX */ + ATH_DEBUG_SW_TX_BAW = 0x008000000ULL, /* BAW handling */ + ATH_DEBUG_SW_TX_CTRL = 0x010000000ULL, /* queue control */ + ATH_DEBUG_SW_TX_AGGR = 0x020000000ULL, /* aggregate TX */ + ATH_DEBUG_SW_TX_RETRIES = 0x040000000ULL, /* software TX retries */ + ATH_DEBUG_FATAL = 0x080000000ULL, /* fatal errors */ + ATH_DEBUG_SW_TX_BAR = 0x100000000ULL, /* BAR TX */ + ATH_DEBUG_ANY = 0xffffffffffffffffULL }; -extern int ath_debug; +extern uint64_t ath_debug; #define IFF_DUMPPKTS(sc, m) \ ((sc->sc_debug & (m)) || \ Modified: projects/nand/sys/dev/ath/if_ath_sysctl.c ============================================================================== --- projects/nand/sys/dev/ath/if_ath_sysctl.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/dev/ath/if_ath_sysctl.c Wed May 16 07:18:56 2012 (r235501) @@ -501,8 +501,8 @@ ath_sysctlattach(struct ath_softc *sc) "regdomain", CTLFLAG_RD, &sc->sc_eerd, 0, "EEPROM regdomain code"); #ifdef ATH_DEBUG - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, - "debug", CTLFLAG_RW, &sc->sc_debug, 0, + SYSCTL_ADD_QUAD(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "debug", CTLFLAG_RW, &sc->sc_debug, "control debugging printfs"); #endif SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, Modified: projects/nand/sys/dev/ath/if_ath_tx.c ============================================================================== --- projects/nand/sys/dev/ath/if_ath_tx.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/dev/ath/if_ath_tx.c Wed May 16 07:18:56 2012 (r235501) @@ -2673,7 +2673,7 @@ ath_tx_tid_bar_suspend(struct ath_softc { ATH_TXQ_LOCK_ASSERT(sc->sc_ac2q[tid->ac]); - DPRINTF(sc, ATH_DEBUG_SW_TX_BAW, + DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, "%s: tid=%p, called\n", __func__, tid); @@ -2704,7 +2704,7 @@ ath_tx_tid_bar_unsuspend(struct ath_soft { ATH_TXQ_LOCK_ASSERT(sc->sc_ac2q[tid->ac]); - DPRINTF(sc, ATH_DEBUG_SW_TX_BAW, + DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, "%s: tid=%p, called\n", __func__, tid); @@ -2732,6 +2732,9 @@ ath_tx_tid_bar_tx_ready(struct ath_softc if (tid->bar_wait == 0 || tid->hwq_depth > 0) return (0); + DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, "%s: tid=%p (%d), bar ready\n", + __func__, tid, tid->tid); + return (1); } @@ -2754,7 +2757,7 @@ ath_tx_tid_bar_tx(struct ath_softc *sc, ATH_TXQ_LOCK_ASSERT(sc->sc_ac2q[tid->ac]); - DPRINTF(sc, ATH_DEBUG_SW_TX_BAW, + DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, "%s: tid=%p, called\n", __func__, tid); @@ -2776,7 +2779,7 @@ ath_tx_tid_bar_tx(struct ath_softc *sc, /* Don't do anything if we still have pending frames */ if (tid->hwq_depth > 0) { - DPRINTF(sc, ATH_DEBUG_SW_TX_BAW, + DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, "%s: tid=%p, hwq_depth=%d, waiting\n", __func__, tid, @@ -2793,7 +2796,7 @@ ath_tx_tid_bar_tx(struct ath_softc *sc, * * XXX verify this is _actually_ the valid value to begin at! */ - DPRINTF(sc, ATH_DEBUG_SW_TX_BAW, + DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, "%s: tid=%p, new BAW left edge=%d\n", __func__, tid, @@ -2865,10 +2868,11 @@ ath_tx_tid_drain(struct ath_softc *sc, s SEQNO(bf->bf_state.bfs_seqno), bf->bf_state.bfs_retries); device_printf(sc->sc_dev, - "%s: node %p: bf=%p: tid txq_depth=%d hwq_depth=%d\n", + "%s: node %p: bf=%p: tid txq_depth=%d hwq_depth=%d, bar_wait=%d\n", __func__, ni, bf, tid->axq_depth, - tid->hwq_depth); + tid->hwq_depth, + tid->bar_wait); device_printf(sc->sc_dev, "%s: node %p: bf=%p: tid %d: txq_depth=%d, " "txq_aggr_depth=%d, sched=%d, paused=%d, " @@ -4440,8 +4444,11 @@ ath_bar_response(struct ieee80211_node * struct ath_tid *atid = &an->an_tid[tid]; int attempts = tap->txa_attempts; - DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, - "%s: called; status=%d\n", __func__, status); + DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, + "%s: called; status=%d, attempts=%d\n", + __func__, + status, + attempts); /* Note: This may update the BAW details */ sc->sc_bar_response(ni, tap, status); Modified: projects/nand/sys/dev/ath/if_athvar.h ============================================================================== --- projects/nand/sys/dev/ath/if_athvar.h Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/dev/ath/if_athvar.h Wed May 16 07:18:56 2012 (r235501) @@ -351,7 +351,7 @@ struct ath_softc { struct ath_stats sc_stats; /* interface statistics */ struct ath_tx_aggr_stats sc_aggr_stats; struct ath_intr_stats sc_intr_stats; - int sc_debug; + uint64_t sc_debug; int sc_nvaps; /* # vaps */ int sc_nstavaps; /* # station vaps */ int sc_nmeshvaps; /* # mbss vaps */ Modified: projects/nand/sys/kern/sched_4bsd.c ============================================================================== --- projects/nand/sys/kern/sched_4bsd.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/kern/sched_4bsd.c Wed May 16 07:18:56 2012 (r235501) @@ -1347,7 +1347,7 @@ sched_add(struct thread *td, int flags) sched_tdname(curthread)); KTR_POINT1(KTR_SCHED, "thread", sched_tdname(curthread), "wokeup", KTR_ATTR_LINKED, sched_tdname(td)); - STD_PROBE4(sched, , , enqueue, td, td->td_proc, NULL, + SDT_PROBE4(sched, , , enqueue, td, td->td_proc, NULL, flags & SRQ_PREEMPTED); /* Modified: projects/nand/sys/netinet/tcp_lro.c ============================================================================== --- projects/nand/sys/netinet/tcp_lro.c Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/netinet/tcp_lro.c Wed May 16 07:18:56 2012 (r235501) @@ -1,37 +1,31 @@ -/****************************************************************************** - -Copyright (c) 2007, Myricom Inc. -Copyright (c) 2008, Intel Corporation. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Neither the name of the Myricom Inc, nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - 3. Neither the name of the Intel Corporation, nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ -***************************************************************************/ +/*- + * Copyright (c) 2007, Myricom Inc. + * Copyright (c) 2008, Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ #include #include Modified: projects/nand/sys/netinet/tcp_lro.h ============================================================================== --- projects/nand/sys/netinet/tcp_lro.h Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/sys/netinet/tcp_lro.h Wed May 16 07:18:56 2012 (r235501) @@ -1,39 +1,32 @@ -/******************************************************************************* +/*- + * Copyright (c) 2006, Myricom Inc. + * Copyright (c) 2008, Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ -Copyright (c) 2006, Myricom Inc. -Copyright (c) 2008, Intel Corporation. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Neither the name of the Myricom Inc, nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - 2. Neither the name of the Intel Corporation, nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - -$FreeBSD$ - -***************************************************************************/ #ifndef _TCP_LRO_H_ #define _TCP_LRO_H_ Modified: projects/nand/usr.sbin/wpa/hostapd/hostapd.conf.5 ============================================================================== --- projects/nand/usr.sbin/wpa/hostapd/hostapd.conf.5 Wed May 16 04:21:21 2012 (r235500) +++ projects/nand/usr.sbin/wpa/hostapd/hostapd.conf.5 Wed May 16 07:18:56 2012 (r235501) @@ -172,8 +172,8 @@ will be converted to PSK. This conversion uses SSID so the PSK changes when ASCII passphrase is used and the SSID is changed. .It Va wpa_psk_file -Optionally, WPA PSKs can be read from a separate text file (containing a -list of PSK,MAC address pairs). +Optionally, WPA PSKs can be read from a separate text file containing a +list of PSK and MAC address pairs. .It Va wpa_key_mgmt Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). .It Va wpa_pairwise