From owner-svn-src-projects@FreeBSD.ORG Mon Mar 5 17:58:59 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 957F6106567B; Mon, 5 Mar 2012 17:58:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8259A8FC25; Mon, 5 Mar 2012 17:58:59 +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 q25HwxPK097444; Mon, 5 Mar 2012 17:58:59 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q25HwxH1097429; Mon, 5 Mar 2012 17:58:59 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201203051758.q25HwxH1097429@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 5 Mar 2012 17:58:59 +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: r232557 - in projects/multi-fibv6/8: . contrib/bsnmp/snmpd contrib/top contrib/xz etc gnu/usr.bin lib lib/liblzma lib/librtld_db lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/cl... 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: Mon, 05 Mar 2012 17:58:59 -0000 Author: bz Date: Mon Mar 5 17:58:58 2012 New Revision: 232557 URL: http://svn.freebsd.org/changeset/base/232557 Log: IF stable/8 --record-only r232552. IF stable/8 @r232556 Sponsored by: Cisco Systems, Inc. Modified: projects/multi-fibv6/8/etc/rc.subr projects/multi-fibv6/8/sbin/route/route.c projects/multi-fibv6/8/share/man/man4/lagg.4 projects/multi-fibv6/8/sys/amd64/amd64/busdma_machdep.c projects/multi-fibv6/8/sys/dev/isci/isci.c projects/multi-fibv6/8/sys/dev/usb/serial/u3g.c projects/multi-fibv6/8/sys/dev/usb/usbdevs projects/multi-fibv6/8/sys/dev/xen/blkback/blkback.c projects/multi-fibv6/8/sys/dev/xen/blkfront/blkfront.c projects/multi-fibv6/8/sys/dev/xen/blkfront/block.h projects/multi-fibv6/8/sys/i386/i386/busdma_machdep.c projects/multi-fibv6/8/sys/net/ieee8023ad_lacp.c projects/multi-fibv6/8/sys/net/if_lagg.c projects/multi-fibv6/8/sys/net/if_lagg.h projects/multi-fibv6/8/sys/netgraph/ng_base.c projects/multi-fibv6/8/sys/sys/param.h projects/multi-fibv6/8/sys/xen/interface/io/blkif.h projects/multi-fibv6/8/sys/xen/xenbus/xenbusvar.h projects/multi-fibv6/8/usr.sbin/cron/crontab/crontab.c projects/multi-fibv6/8/usr.sbin/pkg_install/add/main.c projects/multi-fibv6/8/usr.sbin/pw/pw_user.c Directory Properties: projects/multi-fibv6/8/ (props changed) projects/multi-fibv6/8/COPYRIGHT (props changed) projects/multi-fibv6/8/LOCKS (props changed) projects/multi-fibv6/8/MAINTAINERS (props changed) projects/multi-fibv6/8/Makefile (props changed) projects/multi-fibv6/8/Makefile.inc1 (props changed) projects/multi-fibv6/8/ObsoleteFiles.inc (props changed) projects/multi-fibv6/8/README (props changed) projects/multi-fibv6/8/UPDATING (props changed) projects/multi-fibv6/8/bin/ (props changed) projects/multi-fibv6/8/bin/chio/ (props changed) projects/multi-fibv6/8/bin/chmod/ (props changed) projects/multi-fibv6/8/bin/cp/ (props changed) projects/multi-fibv6/8/bin/csh/ (props changed) projects/multi-fibv6/8/bin/date/ (props changed) projects/multi-fibv6/8/bin/df/ (props changed) projects/multi-fibv6/8/bin/echo/ (props changed) projects/multi-fibv6/8/bin/ed/ (props changed) projects/multi-fibv6/8/bin/expr/ (props changed) projects/multi-fibv6/8/bin/getfacl/ (props changed) projects/multi-fibv6/8/bin/kenv/ (props changed) projects/multi-fibv6/8/bin/kill/ (props changed) projects/multi-fibv6/8/bin/ln/ (props changed) projects/multi-fibv6/8/bin/ls/ (props changed) projects/multi-fibv6/8/bin/mv/ (props changed) projects/multi-fibv6/8/bin/pax/ (props changed) projects/multi-fibv6/8/bin/pkill/ (props changed) projects/multi-fibv6/8/bin/ps/ (props changed) projects/multi-fibv6/8/bin/pwait/ (props changed) projects/multi-fibv6/8/bin/setfacl/ (props changed) projects/multi-fibv6/8/bin/sh/ (props changed) projects/multi-fibv6/8/bin/sleep/ (props changed) projects/multi-fibv6/8/bin/stty/ (props changed) projects/multi-fibv6/8/bin/test/ (props changed) projects/multi-fibv6/8/cddl/ (props changed) projects/multi-fibv6/8/cddl/compat/opensolaris/ (props changed) projects/multi-fibv6/8/cddl/contrib/dtracetoolkit/ (props changed) projects/multi-fibv6/8/cddl/contrib/opensolaris/ (props changed) projects/multi-fibv6/8/cddl/lib/ (props changed) projects/multi-fibv6/8/cddl/lib/libnvpair/ (props changed) projects/multi-fibv6/8/cddl/lib/libzpool/ (props changed) projects/multi-fibv6/8/cddl/sbin/ (props changed) projects/multi-fibv6/8/cddl/usr.bin/ (props changed) projects/multi-fibv6/8/cddl/usr.sbin/ (props changed) projects/multi-fibv6/8/contrib/ (props changed) projects/multi-fibv6/8/contrib/amd/ (props changed) projects/multi-fibv6/8/contrib/bc/ (props changed) projects/multi-fibv6/8/contrib/bind9/ (props changed) projects/multi-fibv6/8/contrib/binutils/ (props changed) projects/multi-fibv6/8/contrib/bsnmp/ (props changed) projects/multi-fibv6/8/contrib/bsnmp/snmpd/bsnmpd.1 (props changed) projects/multi-fibv6/8/contrib/bzip2/ (props changed) projects/multi-fibv6/8/contrib/com_err/ (props changed) projects/multi-fibv6/8/contrib/cvs/ (props changed) projects/multi-fibv6/8/contrib/diff/ (props changed) projects/multi-fibv6/8/contrib/ee/ (props changed) projects/multi-fibv6/8/contrib/expat/ (props changed) projects/multi-fibv6/8/contrib/file/ (props changed) projects/multi-fibv6/8/contrib/gcc/ (props changed) projects/multi-fibv6/8/contrib/gcclibs/ (props changed) projects/multi-fibv6/8/contrib/gdb/ (props changed) projects/multi-fibv6/8/contrib/gdtoa/ (props changed) projects/multi-fibv6/8/contrib/gnu-sort/ (props changed) projects/multi-fibv6/8/contrib/gperf/ (props changed) projects/multi-fibv6/8/contrib/groff/ (props changed) projects/multi-fibv6/8/contrib/ipfilter/ (props changed) projects/multi-fibv6/8/contrib/less/ (props changed) projects/multi-fibv6/8/contrib/libarchive/ (props changed) projects/multi-fibv6/8/contrib/libarchive/cpio/ (props changed) projects/multi-fibv6/8/contrib/libarchive/libarchive/ (props changed) projects/multi-fibv6/8/contrib/libarchive/libarchive_fe/ (props changed) projects/multi-fibv6/8/contrib/libarchive/tar/ (props changed) projects/multi-fibv6/8/contrib/libbegemot/ (props changed) projects/multi-fibv6/8/contrib/libf2c/ (props changed) projects/multi-fibv6/8/contrib/libobjc/ (props changed) projects/multi-fibv6/8/contrib/libpcap/ (props changed) projects/multi-fibv6/8/contrib/libreadline/ (props changed) projects/multi-fibv6/8/contrib/libstdc++/ (props changed) projects/multi-fibv6/8/contrib/lukemftp/ (props changed) projects/multi-fibv6/8/contrib/lukemftpd/ (props changed) projects/multi-fibv6/8/contrib/ncurses/ (props changed) projects/multi-fibv6/8/contrib/netcat/ (props changed) projects/multi-fibv6/8/contrib/ngatm/ (props changed) projects/multi-fibv6/8/contrib/ntp/ (props changed) projects/multi-fibv6/8/contrib/nvi/ (props changed) projects/multi-fibv6/8/contrib/one-true-awk/ (props changed) projects/multi-fibv6/8/contrib/openbsm/ (props changed) projects/multi-fibv6/8/contrib/openpam/ (props changed) projects/multi-fibv6/8/contrib/opie/ (props changed) projects/multi-fibv6/8/contrib/pam_modules/ (props changed) projects/multi-fibv6/8/contrib/pf/ (props changed) projects/multi-fibv6/8/contrib/pnpinfo/ (props changed) projects/multi-fibv6/8/contrib/sendmail/ (props changed) projects/multi-fibv6/8/contrib/smbfs/ (props changed) projects/multi-fibv6/8/contrib/tcp_wrappers/ (props changed) projects/multi-fibv6/8/contrib/tcpdump/ (props changed) projects/multi-fibv6/8/contrib/tcsh/ (props changed) projects/multi-fibv6/8/contrib/telnet/ (props changed) projects/multi-fibv6/8/contrib/texinfo/ (props changed) projects/multi-fibv6/8/contrib/top/ (props changed) projects/multi-fibv6/8/contrib/top/install-sh (props changed) projects/multi-fibv6/8/contrib/traceroute/ (props changed) projects/multi-fibv6/8/contrib/wpa/ (props changed) projects/multi-fibv6/8/contrib/xz/ (props changed) projects/multi-fibv6/8/contrib/xz/AUTHORS (props changed) projects/multi-fibv6/8/contrib/xz/COPYING (props changed) projects/multi-fibv6/8/contrib/xz/ChangeLog (props changed) projects/multi-fibv6/8/contrib/xz/FREEBSD-Xlist (props changed) projects/multi-fibv6/8/contrib/xz/FREEBSD-upgrade (props changed) projects/multi-fibv6/8/contrib/xz/README (props changed) projects/multi-fibv6/8/contrib/xz/THANKS (props changed) projects/multi-fibv6/8/contrib/xz/TODO (props changed) projects/multi-fibv6/8/contrib/xz/po/ (props changed) projects/multi-fibv6/8/contrib/xz/src/ (props changed) projects/multi-fibv6/8/crypto/ (props changed) projects/multi-fibv6/8/crypto/heimdal/ (props changed) projects/multi-fibv6/8/crypto/openssh/ (props changed) projects/multi-fibv6/8/crypto/openssl/ (props changed) projects/multi-fibv6/8/etc/ (props changed) projects/multi-fibv6/8/games/ (props changed) projects/multi-fibv6/8/games/factor/ (props changed) projects/multi-fibv6/8/games/fortune/ (props changed) projects/multi-fibv6/8/games/grdc/ (props changed) projects/multi-fibv6/8/games/pom/ (props changed) projects/multi-fibv6/8/gnu/ (props changed) projects/multi-fibv6/8/gnu/lib/csu/ (props changed) projects/multi-fibv6/8/gnu/lib/libgcc/ (props changed) projects/multi-fibv6/8/gnu/lib/libstdc++/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/Makefile (props changed) projects/multi-fibv6/8/gnu/usr.bin/binutils/ld/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/cc/cc_tools/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/cc/include/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/dialog/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/gdb/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/gdb/arch/sparc64/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/gdb/kgdb/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/gperf/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/groff/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/patch/ (props changed) projects/multi-fibv6/8/include/ (props changed) projects/multi-fibv6/8/kerberos5/ (props changed) projects/multi-fibv6/8/kerberos5/lib/libgssapi_krb5/ (props changed) projects/multi-fibv6/8/kerberos5/lib/libgssapi_spnego/ (props changed) projects/multi-fibv6/8/kerberos5/usr.bin/kdestroy/ (props changed) projects/multi-fibv6/8/kerberos5/usr.bin/kpasswd/ (props changed) projects/multi-fibv6/8/lib/ (props changed) projects/multi-fibv6/8/lib/Makefile (props changed) projects/multi-fibv6/8/lib/Makefile.inc (props changed) projects/multi-fibv6/8/lib/bind/ (props changed) projects/multi-fibv6/8/lib/csu/ (props changed) projects/multi-fibv6/8/lib/libalias/ (props changed) projects/multi-fibv6/8/lib/libarchive/ (props changed) projects/multi-fibv6/8/lib/libauditd/ (props changed) projects/multi-fibv6/8/lib/libautofs/ (props changed) projects/multi-fibv6/8/lib/libbegemot/ (props changed) projects/multi-fibv6/8/lib/libbluetooth/ (props changed) projects/multi-fibv6/8/lib/libbsm/ (props changed) projects/multi-fibv6/8/lib/libbsnmp/ (props changed) projects/multi-fibv6/8/lib/libbz2/ (props changed) projects/multi-fibv6/8/lib/libc/ (props changed) projects/multi-fibv6/8/lib/libc/stdtime/ (props changed) projects/multi-fibv6/8/lib/libc/sys/ (props changed) projects/multi-fibv6/8/lib/libc_r/ (props changed) projects/multi-fibv6/8/lib/libcalendar/ (props changed) projects/multi-fibv6/8/lib/libcam/ (props changed) projects/multi-fibv6/8/lib/libcom_err/ (props changed) projects/multi-fibv6/8/lib/libcompat/ (props changed) projects/multi-fibv6/8/lib/libcrypt/ (props changed) projects/multi-fibv6/8/lib/libdevinfo/ (props changed) projects/multi-fibv6/8/lib/libdevstat/ (props changed) projects/multi-fibv6/8/lib/libdisk/ (props changed) projects/multi-fibv6/8/lib/libdwarf/ (props changed) projects/multi-fibv6/8/lib/libedit/ (props changed) projects/multi-fibv6/8/lib/libelf/ (props changed) projects/multi-fibv6/8/lib/libexpat/ (props changed) projects/multi-fibv6/8/lib/libfetch/ (props changed) projects/multi-fibv6/8/lib/libftpio/ (props changed) projects/multi-fibv6/8/lib/libgeom/ (props changed) projects/multi-fibv6/8/lib/libgpib/ (props changed) projects/multi-fibv6/8/lib/libgssapi/ (props changed) projects/multi-fibv6/8/lib/libipsec/ (props changed) projects/multi-fibv6/8/lib/libipx/ (props changed) projects/multi-fibv6/8/lib/libjail/ (props changed) projects/multi-fibv6/8/lib/libkiconv/ (props changed) projects/multi-fibv6/8/lib/libkse/ (props changed) projects/multi-fibv6/8/lib/libkvm/ (props changed) projects/multi-fibv6/8/lib/liblzma/ (props changed) projects/multi-fibv6/8/lib/liblzma/Makefile (props changed) projects/multi-fibv6/8/lib/liblzma/Symbol.map (props changed) projects/multi-fibv6/8/lib/liblzma/Versions.def (props changed) projects/multi-fibv6/8/lib/liblzma/config.h (props changed) projects/multi-fibv6/8/lib/libmagic/ (props changed) projects/multi-fibv6/8/lib/libmd/ (props changed) projects/multi-fibv6/8/lib/libmemstat/ (props changed) projects/multi-fibv6/8/lib/libmilter/ (props changed) projects/multi-fibv6/8/lib/libmp/ (props changed) projects/multi-fibv6/8/lib/libncp/ (props changed) projects/multi-fibv6/8/lib/libnetgraph/ (props changed) projects/multi-fibv6/8/lib/libngatm/ (props changed) projects/multi-fibv6/8/lib/libopie/ (props changed) projects/multi-fibv6/8/lib/libpam/ (props changed) projects/multi-fibv6/8/lib/libpcap/ (props changed) projects/multi-fibv6/8/lib/libpmc/ (props changed) projects/multi-fibv6/8/lib/libproc/ (props changed) projects/multi-fibv6/8/lib/libradius/ (props changed) projects/multi-fibv6/8/lib/librpcsec_gss/ (props changed) projects/multi-fibv6/8/lib/librpcsvc/ (props changed) projects/multi-fibv6/8/lib/librt/ (props changed) projects/multi-fibv6/8/lib/librtld_db/ (props changed) projects/multi-fibv6/8/lib/librtld_db/Makefile (props changed) projects/multi-fibv6/8/lib/librtld_db/librtld_db.3 (props changed) projects/multi-fibv6/8/lib/librtld_db/rtld_db.c (props changed) projects/multi-fibv6/8/lib/librtld_db/rtld_db.h (props changed) projects/multi-fibv6/8/lib/libsbuf/ (props changed) projects/multi-fibv6/8/lib/libsdp/ (props changed) projects/multi-fibv6/8/lib/libsm/ (props changed) projects/multi-fibv6/8/lib/libsmb/ (props changed) projects/multi-fibv6/8/lib/libsmdb/ (props changed) projects/multi-fibv6/8/lib/libsmutil/ (props changed) projects/multi-fibv6/8/lib/libstand/ (props changed) projects/multi-fibv6/8/lib/libtacplus/ (props changed) projects/multi-fibv6/8/lib/libtelnet/ (props changed) projects/multi-fibv6/8/lib/libthr/ (props changed) projects/multi-fibv6/8/lib/libthread_db/ (props changed) projects/multi-fibv6/8/lib/libufs/ (props changed) projects/multi-fibv6/8/lib/libugidfw/ (props changed) projects/multi-fibv6/8/lib/libusb/ (props changed) projects/multi-fibv6/8/lib/libusb/usb.h (props changed) projects/multi-fibv6/8/lib/libusbhid/ (props changed) projects/multi-fibv6/8/lib/libutil/ (props changed) projects/multi-fibv6/8/lib/libvgl/ (props changed) projects/multi-fibv6/8/lib/libwrap/ (props changed) projects/multi-fibv6/8/lib/liby/ (props changed) projects/multi-fibv6/8/lib/libypclnt/ (props changed) projects/multi-fibv6/8/lib/libz/ (props changed) projects/multi-fibv6/8/lib/libz/contrib/ (props changed) projects/multi-fibv6/8/lib/msun/ (props changed) projects/multi-fibv6/8/lib/ncurses/ (props changed) projects/multi-fibv6/8/libexec/ (props changed) projects/multi-fibv6/8/libexec/comsat/ (props changed) projects/multi-fibv6/8/libexec/ftpd/ (props changed) projects/multi-fibv6/8/libexec/rshd/ (props changed) projects/multi-fibv6/8/libexec/rtld-elf/ (props changed) projects/multi-fibv6/8/libexec/tftpd/ (props changed) projects/multi-fibv6/8/libexec/ypxfr/ (props changed) projects/multi-fibv6/8/release/ (props changed) projects/multi-fibv6/8/release/doc/en_US.ISO8859-1/hardware/ (props changed) projects/multi-fibv6/8/release/picobsd/ (props changed) projects/multi-fibv6/8/release/picobsd/floppy.tree/sbin/ (props changed) projects/multi-fibv6/8/release/picobsd/floppy.tree/sbin/dhclient-script (props changed) projects/multi-fibv6/8/release/picobsd/qemu/ (props changed) projects/multi-fibv6/8/release/picobsd/tinyware/login/ (props changed) projects/multi-fibv6/8/release/picobsd/tinyware/passwd/ (props changed) projects/multi-fibv6/8/release/powerpc/ (props changed) projects/multi-fibv6/8/rescue/ (props changed) projects/multi-fibv6/8/rescue/rescue/ (props changed) projects/multi-fibv6/8/sbin/ (props changed) projects/multi-fibv6/8/sbin/atacontrol/ (props changed) projects/multi-fibv6/8/sbin/bsdlabel/ (props changed) projects/multi-fibv6/8/sbin/camcontrol/ (props changed) projects/multi-fibv6/8/sbin/conscontrol/ (props changed) projects/multi-fibv6/8/sbin/ddb/ (props changed) projects/multi-fibv6/8/sbin/devd/ (props changed) projects/multi-fibv6/8/sbin/devfs/ (props changed) projects/multi-fibv6/8/sbin/dhclient/ (props changed) projects/multi-fibv6/8/sbin/dump/ (props changed) projects/multi-fibv6/8/sbin/dumpfs/ (props changed) projects/multi-fibv6/8/sbin/fdisk/ (props changed) projects/multi-fibv6/8/sbin/fsck/ (props changed) projects/multi-fibv6/8/sbin/fsck_ffs/ (props changed) projects/multi-fibv6/8/sbin/fsck_msdosfs/ (props changed) projects/multi-fibv6/8/sbin/fsirand/ (props changed) projects/multi-fibv6/8/sbin/geom/ (props changed) projects/multi-fibv6/8/sbin/geom/class/multipath/ (props changed) projects/multi-fibv6/8/sbin/geom/class/part/ (props changed) projects/multi-fibv6/8/sbin/geom/class/sched/gsched.8 (props changed) projects/multi-fibv6/8/sbin/geom/class/stripe/ (props changed) projects/multi-fibv6/8/sbin/ggate/ (props changed) projects/multi-fibv6/8/sbin/growfs/ (props changed) projects/multi-fibv6/8/sbin/gvinum/ (props changed) projects/multi-fibv6/8/sbin/hastctl/ (props changed) projects/multi-fibv6/8/sbin/hastd/ (props changed) projects/multi-fibv6/8/sbin/ifconfig/ (props changed) projects/multi-fibv6/8/sbin/ipfw/ (props changed) projects/multi-fibv6/8/sbin/iscontrol/ (props changed) projects/multi-fibv6/8/sbin/kldload/ (props changed) projects/multi-fibv6/8/sbin/kldstat/ (props changed) projects/multi-fibv6/8/sbin/md5/ (props changed) projects/multi-fibv6/8/sbin/mdconfig/ (props changed) projects/multi-fibv6/8/sbin/mdmfs/ (props changed) projects/multi-fibv6/8/sbin/mknod/ (props changed) projects/multi-fibv6/8/sbin/mksnap_ffs/ (props changed) projects/multi-fibv6/8/sbin/mount/ (props changed) projects/multi-fibv6/8/sbin/mount_cd9660/ (props changed) projects/multi-fibv6/8/sbin/mount_msdosfs/ (props changed) projects/multi-fibv6/8/sbin/mount_nfs/ (props changed) projects/multi-fibv6/8/sbin/mount_unionfs/ (props changed) projects/multi-fibv6/8/sbin/natd/ (props changed) projects/multi-fibv6/8/sbin/newfs/ (props changed) projects/multi-fibv6/8/sbin/newfs_msdos/ (props changed) projects/multi-fibv6/8/sbin/ping6/ (props changed) projects/multi-fibv6/8/sbin/quotacheck/ (props changed) projects/multi-fibv6/8/sbin/rcorder/ (props changed) projects/multi-fibv6/8/sbin/reboot/ (props changed) projects/multi-fibv6/8/sbin/restore/ (props changed) projects/multi-fibv6/8/sbin/route/ (props changed) projects/multi-fibv6/8/sbin/routed/ (props changed) projects/multi-fibv6/8/sbin/setkey/ (props changed) projects/multi-fibv6/8/sbin/shutdown/ (props changed) projects/multi-fibv6/8/sbin/spppcontrol/ (props changed) projects/multi-fibv6/8/sbin/sysctl/ (props changed) projects/multi-fibv6/8/sbin/tunefs/ (props changed) projects/multi-fibv6/8/sbin/umount/ (props changed) projects/multi-fibv6/8/secure/ (props changed) projects/multi-fibv6/8/secure/lib/libcrypto/ (props changed) projects/multi-fibv6/8/secure/lib/libssl/ (props changed) projects/multi-fibv6/8/secure/usr.bin/bdes/ (props changed) projects/multi-fibv6/8/secure/usr.bin/openssl/ (props changed) projects/multi-fibv6/8/share/ (props changed) projects/multi-fibv6/8/share/dict/ (props changed) projects/multi-fibv6/8/share/doc/ (props changed) projects/multi-fibv6/8/share/doc/papers/devfs/ (props changed) projects/multi-fibv6/8/share/doc/papers/jail/ (props changed) projects/multi-fibv6/8/share/doc/smm/01.setup/ (props changed) projects/multi-fibv6/8/share/examples/ (props changed) projects/multi-fibv6/8/share/examples/cvsup/ (props changed) projects/multi-fibv6/8/share/man/ (props changed) projects/multi-fibv6/8/share/man/man1/ (props changed) projects/multi-fibv6/8/share/man/man3/ (props changed) projects/multi-fibv6/8/share/man/man4/ (props changed) projects/multi-fibv6/8/share/man/man5/ (props changed) projects/multi-fibv6/8/share/man/man7/ (props changed) projects/multi-fibv6/8/share/man/man8/ (props changed) projects/multi-fibv6/8/share/man/man9/ (props changed) projects/multi-fibv6/8/share/misc/ (props changed) projects/multi-fibv6/8/share/misc/bsd-family-tree (props changed) projects/multi-fibv6/8/share/mk/ (props changed) projects/multi-fibv6/8/share/skel/ (props changed) projects/multi-fibv6/8/share/syscons/ (props changed) projects/multi-fibv6/8/share/termcap/ (props changed) projects/multi-fibv6/8/share/timedef/ (props changed) projects/multi-fibv6/8/share/zoneinfo/ (props changed) projects/multi-fibv6/8/sys/ (props changed) projects/multi-fibv6/8/sys/amd64/include/xen/ (props changed) projects/multi-fibv6/8/sys/boot/ (props changed) projects/multi-fibv6/8/sys/cddl/contrib/opensolaris/ (props changed) projects/multi-fibv6/8/sys/contrib/dev/acpica/ (props changed) projects/multi-fibv6/8/sys/contrib/pf/ (props changed) projects/multi-fibv6/8/sys/dev/e1000/ (props changed) projects/multi-fibv6/8/sys/i386/conf/XENHVM (props changed) projects/multi-fibv6/8/tools/ (props changed) projects/multi-fibv6/8/tools/build/mk/ (props changed) projects/multi-fibv6/8/tools/build/options/ (props changed) projects/multi-fibv6/8/tools/debugscripts/ (props changed) projects/multi-fibv6/8/tools/kerneldoc/subsys/ (props changed) projects/multi-fibv6/8/tools/regression/acct/ (props changed) projects/multi-fibv6/8/tools/regression/acltools/ (props changed) projects/multi-fibv6/8/tools/regression/aio/aiotest/ (props changed) projects/multi-fibv6/8/tools/regression/bin/ (props changed) projects/multi-fibv6/8/tools/regression/bin/date/ (props changed) projects/multi-fibv6/8/tools/regression/bin/sh/ (props changed) projects/multi-fibv6/8/tools/regression/bin/test/ (props changed) projects/multi-fibv6/8/tools/regression/doat/ (props changed) projects/multi-fibv6/8/tools/regression/fifo/ (props changed) projects/multi-fibv6/8/tools/regression/geom/ (props changed) projects/multi-fibv6/8/tools/regression/lib/libc/ (props changed) projects/multi-fibv6/8/tools/regression/lib/msun/test-conj.t (props changed) projects/multi-fibv6/8/tools/regression/mqueue/mqtest1/ (props changed) projects/multi-fibv6/8/tools/regression/mqueue/mqtest2/ (props changed) projects/multi-fibv6/8/tools/regression/mqueue/mqtest3/ (props changed) projects/multi-fibv6/8/tools/regression/mqueue/mqtest4/ (props changed) projects/multi-fibv6/8/tools/regression/mqueue/mqtest5/ (props changed) projects/multi-fibv6/8/tools/regression/netinet/ (props changed) projects/multi-fibv6/8/tools/regression/poll/ (props changed) projects/multi-fibv6/8/tools/regression/posixsem/ (props changed) projects/multi-fibv6/8/tools/regression/priv/ (props changed) projects/multi-fibv6/8/tools/regression/sockets/unix_gc/ (props changed) projects/multi-fibv6/8/tools/regression/usr.bin/ (props changed) projects/multi-fibv6/8/tools/regression/usr.bin/pkill/ (props changed) projects/multi-fibv6/8/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/multi-fibv6/8/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/multi-fibv6/8/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/multi-fibv6/8/tools/regression/usr.bin/sed/ (props changed) projects/multi-fibv6/8/tools/regression/usr.bin/tr/ (props changed) projects/multi-fibv6/8/tools/test/ (props changed) projects/multi-fibv6/8/tools/test/malloc/ (props changed) projects/multi-fibv6/8/tools/tools/ (props changed) projects/multi-fibv6/8/tools/tools/aac/ (props changed) projects/multi-fibv6/8/tools/tools/ath/ (props changed) projects/multi-fibv6/8/tools/tools/ath/common/dumpregs.h (props changed) projects/multi-fibv6/8/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/multi-fibv6/8/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/multi-fibv6/8/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/multi-fibv6/8/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/multi-fibv6/8/tools/tools/cfi/ (props changed) projects/multi-fibv6/8/tools/tools/ether_reflect/ (props changed) projects/multi-fibv6/8/tools/tools/iwi/ (props changed) projects/multi-fibv6/8/tools/tools/mctest/ (props changed) projects/multi-fibv6/8/tools/tools/nanobsd/ (props changed) projects/multi-fibv6/8/tools/tools/netrate/ (props changed) projects/multi-fibv6/8/tools/tools/netrate/netblast/ (props changed) projects/multi-fibv6/8/tools/tools/netrate/netsend/ (props changed) projects/multi-fibv6/8/tools/tools/netrate/tcpp/ (props changed) projects/multi-fibv6/8/tools/tools/termcap/termcap.pl (props changed) projects/multi-fibv6/8/tools/tools/umastat/ (props changed) projects/multi-fibv6/8/tools/tools/vimage/ (props changed) projects/multi-fibv6/8/usr.bin/ (props changed) projects/multi-fibv6/8/usr.bin/apply/ (props changed) projects/multi-fibv6/8/usr.bin/ar/ (props changed) projects/multi-fibv6/8/usr.bin/awk/ (props changed) projects/multi-fibv6/8/usr.bin/biff/ (props changed) projects/multi-fibv6/8/usr.bin/c89/ (props changed) projects/multi-fibv6/8/usr.bin/c99/ (props changed) projects/multi-fibv6/8/usr.bin/calendar/ (props changed) projects/multi-fibv6/8/usr.bin/catman/ (props changed) projects/multi-fibv6/8/usr.bin/checknr/ (props changed) projects/multi-fibv6/8/usr.bin/chpass/Makefile (props changed) projects/multi-fibv6/8/usr.bin/column/ (props changed) projects/multi-fibv6/8/usr.bin/comm/ (props changed) projects/multi-fibv6/8/usr.bin/compress/ (props changed) projects/multi-fibv6/8/usr.bin/cpio/ (props changed) projects/multi-fibv6/8/usr.bin/cpuset/ (props changed) projects/multi-fibv6/8/usr.bin/csup/ (props changed) projects/multi-fibv6/8/usr.bin/du/ (props changed) projects/multi-fibv6/8/usr.bin/ee/ (props changed) projects/multi-fibv6/8/usr.bin/enigma/ (props changed) projects/multi-fibv6/8/usr.bin/fetch/ (props changed) projects/multi-fibv6/8/usr.bin/find/ (props changed) projects/multi-fibv6/8/usr.bin/finger/ (props changed) projects/multi-fibv6/8/usr.bin/fold/ (props changed) projects/multi-fibv6/8/usr.bin/fstat/ (props changed) projects/multi-fibv6/8/usr.bin/gcore/ (props changed) projects/multi-fibv6/8/usr.bin/getopt/ (props changed) projects/multi-fibv6/8/usr.bin/gzip/ (props changed) projects/multi-fibv6/8/usr.bin/hexdump/ (props changed) projects/multi-fibv6/8/usr.bin/indent/ (props changed) projects/multi-fibv6/8/usr.bin/ipcs/ (props changed) projects/multi-fibv6/8/usr.bin/jot/ (props changed) projects/multi-fibv6/8/usr.bin/kdump/ (props changed) projects/multi-fibv6/8/usr.bin/killall/ (props changed) projects/multi-fibv6/8/usr.bin/ktrace/ (props changed) projects/multi-fibv6/8/usr.bin/lastcomm/ (props changed) projects/multi-fibv6/8/usr.bin/ldd/ (props changed) projects/multi-fibv6/8/usr.bin/less/ (props changed) projects/multi-fibv6/8/usr.bin/lex/ (props changed) projects/multi-fibv6/8/usr.bin/limits/ (props changed) projects/multi-fibv6/8/usr.bin/locale/ (props changed) projects/multi-fibv6/8/usr.bin/locate/ (props changed) projects/multi-fibv6/8/usr.bin/lock/ (props changed) projects/multi-fibv6/8/usr.bin/lockf/ (props changed) projects/multi-fibv6/8/usr.bin/logger/ (props changed) projects/multi-fibv6/8/usr.bin/look/ (props changed) projects/multi-fibv6/8/usr.bin/m4/ (props changed) projects/multi-fibv6/8/usr.bin/mail/ (props changed) projects/multi-fibv6/8/usr.bin/make/ (props changed) projects/multi-fibv6/8/usr.bin/makewhatis/ (props changed) projects/multi-fibv6/8/usr.bin/minigzip/ (props changed) projects/multi-fibv6/8/usr.bin/ncal/ (props changed) projects/multi-fibv6/8/usr.bin/netstat/ (props changed) projects/multi-fibv6/8/usr.bin/netstat/Makefile (props changed) projects/multi-fibv6/8/usr.bin/netstat/atalk.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/bpf.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/if.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/inet.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/inet6.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/ipsec.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/ipx.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/main.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/mbuf.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/mroute.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/mroute6.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/netgraph.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/netisr.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/netstat.1 (props changed) projects/multi-fibv6/8/usr.bin/netstat/netstat.h (props changed) projects/multi-fibv6/8/usr.bin/netstat/pfkey.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/route.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/sctp.c (props changed) projects/multi-fibv6/8/usr.bin/netstat/unix.c (props changed) projects/multi-fibv6/8/usr.bin/newgrp/ (props changed) projects/multi-fibv6/8/usr.bin/nfsstat/ (props changed) projects/multi-fibv6/8/usr.bin/pathchk/ (props changed) projects/multi-fibv6/8/usr.bin/perror/ (props changed) projects/multi-fibv6/8/usr.bin/printf/ (props changed) projects/multi-fibv6/8/usr.bin/procstat/ (props changed) projects/multi-fibv6/8/usr.bin/rlogin/ (props changed) projects/multi-fibv6/8/usr.bin/rpcgen/ (props changed) projects/multi-fibv6/8/usr.bin/rpcinfo/ (props changed) projects/multi-fibv6/8/usr.bin/rs/ (props changed) projects/multi-fibv6/8/usr.bin/ruptime/ (props changed) projects/multi-fibv6/8/usr.bin/script/ (props changed) projects/multi-fibv6/8/usr.bin/sed/ (props changed) projects/multi-fibv6/8/usr.bin/showmount/ (props changed) projects/multi-fibv6/8/usr.bin/sockstat/ (props changed) projects/multi-fibv6/8/usr.bin/split/ (props changed) projects/multi-fibv6/8/usr.bin/stat/ (props changed) projects/multi-fibv6/8/usr.bin/su/ (props changed) projects/multi-fibv6/8/usr.bin/su/Makefile (props changed) projects/multi-fibv6/8/usr.bin/su/su.1 (props changed) projects/multi-fibv6/8/usr.bin/su/su.c (props changed) projects/multi-fibv6/8/usr.bin/systat/ (props changed) projects/multi-fibv6/8/usr.bin/tail/ (props changed) projects/multi-fibv6/8/usr.bin/tar/ (props changed) projects/multi-fibv6/8/usr.bin/tftp/ (props changed) projects/multi-fibv6/8/usr.bin/tip/ (props changed) projects/multi-fibv6/8/usr.bin/top/ (props changed) projects/multi-fibv6/8/usr.bin/touch/ (props changed) projects/multi-fibv6/8/usr.bin/tr/ (props changed) projects/multi-fibv6/8/usr.bin/truss/ (props changed) projects/multi-fibv6/8/usr.bin/uname/ (props changed) projects/multi-fibv6/8/usr.bin/unifdef/ (props changed) projects/multi-fibv6/8/usr.bin/uniq/ (props changed) projects/multi-fibv6/8/usr.bin/unzip/ (props changed) projects/multi-fibv6/8/usr.bin/usbhidaction/ (props changed) projects/multi-fibv6/8/usr.bin/usbhidctl/ (props changed) projects/multi-fibv6/8/usr.bin/uudecode/ (props changed) projects/multi-fibv6/8/usr.bin/vmstat/ (props changed) projects/multi-fibv6/8/usr.bin/w/ (props changed) projects/multi-fibv6/8/usr.bin/wall/ (props changed) projects/multi-fibv6/8/usr.bin/whois/ (props changed) projects/multi-fibv6/8/usr.bin/xargs/ (props changed) projects/multi-fibv6/8/usr.bin/xinstall/ (props changed) projects/multi-fibv6/8/usr.bin/xlint/ (props changed) projects/multi-fibv6/8/usr.bin/xz/ (props changed) projects/multi-fibv6/8/usr.bin/yacc/ (props changed) projects/multi-fibv6/8/usr.sbin/ (props changed) projects/multi-fibv6/8/usr.sbin/IPXrouted/ (props changed) projects/multi-fibv6/8/usr.sbin/Makefile (props changed) projects/multi-fibv6/8/usr.sbin/Makefile.inc (props changed) projects/multi-fibv6/8/usr.sbin/ac/ (props changed) projects/multi-fibv6/8/usr.sbin/accton/ (props changed) projects/multi-fibv6/8/usr.sbin/acpi/ (props changed) projects/multi-fibv6/8/usr.sbin/adduser/ (props changed) projects/multi-fibv6/8/usr.sbin/amd/ (props changed) projects/multi-fibv6/8/usr.sbin/ancontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/apm/ (props changed) projects/multi-fibv6/8/usr.sbin/apmd/ (props changed) projects/multi-fibv6/8/usr.sbin/arp/ (props changed) projects/multi-fibv6/8/usr.sbin/asf/ (props changed) projects/multi-fibv6/8/usr.sbin/audit/ (props changed) projects/multi-fibv6/8/usr.sbin/auditd/ (props changed) projects/multi-fibv6/8/usr.sbin/auditreduce/ (props changed) projects/multi-fibv6/8/usr.sbin/authpf/ (props changed) projects/multi-fibv6/8/usr.sbin/bluetooth/ (props changed) projects/multi-fibv6/8/usr.sbin/bluetooth/bthidcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/bluetooth/bthidd/ (props changed) projects/multi-fibv6/8/usr.sbin/bluetooth/l2control/ (props changed) projects/multi-fibv6/8/usr.sbin/bluetooth/l2ping/ (props changed) projects/multi-fibv6/8/usr.sbin/boot0cfg/ (props changed) projects/multi-fibv6/8/usr.sbin/boot98cfg/ (props changed) projects/multi-fibv6/8/usr.sbin/bootparamd/ (props changed) projects/multi-fibv6/8/usr.sbin/bsnmpd/ (props changed) projects/multi-fibv6/8/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c (props changed) projects/multi-fibv6/8/usr.sbin/btxld/ (props changed) projects/multi-fibv6/8/usr.sbin/burncd/ (props changed) projects/multi-fibv6/8/usr.sbin/cdcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/chkgrp/ (props changed) projects/multi-fibv6/8/usr.sbin/chown/ (props changed) projects/multi-fibv6/8/usr.sbin/chroot/ (props changed) projects/multi-fibv6/8/usr.sbin/ckdist/ (props changed) projects/multi-fibv6/8/usr.sbin/clear_locks/ (props changed) projects/multi-fibv6/8/usr.sbin/config/ (props changed) projects/multi-fibv6/8/usr.sbin/config/SMM.doc/ (props changed) projects/multi-fibv6/8/usr.sbin/cpucontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/crashinfo/ (props changed) projects/multi-fibv6/8/usr.sbin/cron/ (props changed) projects/multi-fibv6/8/usr.sbin/cron/crontab/ (props changed) projects/multi-fibv6/8/usr.sbin/crunch/ (props changed) projects/multi-fibv6/8/usr.sbin/crunch/examples/ (props changed) projects/multi-fibv6/8/usr.sbin/ctm/ (props changed) projects/multi-fibv6/8/usr.sbin/daemon/ (props changed) projects/multi-fibv6/8/usr.sbin/dconschat/ (props changed) projects/multi-fibv6/8/usr.sbin/devinfo/ (props changed) projects/multi-fibv6/8/usr.sbin/digictl/ (props changed) projects/multi-fibv6/8/usr.sbin/diskinfo/ (props changed) projects/multi-fibv6/8/usr.sbin/dnssec-dsfromkey/ (props changed) projects/multi-fibv6/8/usr.sbin/dnssec-keyfromlabel/ (props changed) projects/multi-fibv6/8/usr.sbin/dnssec-keygen/ (props changed) projects/multi-fibv6/8/usr.sbin/dnssec-signzone/ (props changed) projects/multi-fibv6/8/usr.sbin/dumpcis/ (props changed) projects/multi-fibv6/8/usr.sbin/dumpcis/cardinfo.h (props changed) projects/multi-fibv6/8/usr.sbin/dumpcis/cis.h (props changed) projects/multi-fibv6/8/usr.sbin/editmap/ (props changed) projects/multi-fibv6/8/usr.sbin/edquota/ (props changed) projects/multi-fibv6/8/usr.sbin/eeprom/ (props changed) projects/multi-fibv6/8/usr.sbin/extattr/ (props changed) projects/multi-fibv6/8/usr.sbin/extattrctl/ (props changed) projects/multi-fibv6/8/usr.sbin/faithd/ (props changed) projects/multi-fibv6/8/usr.sbin/fdcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/fdformat/ (props changed) projects/multi-fibv6/8/usr.sbin/fdread/ (props changed) projects/multi-fibv6/8/usr.sbin/fdwrite/ (props changed) projects/multi-fibv6/8/usr.sbin/fifolog/ (props changed) projects/multi-fibv6/8/usr.sbin/flowctl/ (props changed) projects/multi-fibv6/8/usr.sbin/freebsd-update/ (props changed) projects/multi-fibv6/8/usr.sbin/ftp-proxy/ (props changed) projects/multi-fibv6/8/usr.sbin/fwcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/getfmac/ (props changed) projects/multi-fibv6/8/usr.sbin/getpmac/ (props changed) projects/multi-fibv6/8/usr.sbin/gssd/ (props changed) projects/multi-fibv6/8/usr.sbin/gstat/ (props changed) projects/multi-fibv6/8/usr.sbin/i2c/ (props changed) projects/multi-fibv6/8/usr.sbin/ifmcstat/ (props changed) projects/multi-fibv6/8/usr.sbin/inetd/ (props changed) projects/multi-fibv6/8/usr.sbin/iostat/ (props changed) projects/multi-fibv6/8/usr.sbin/ip6addrctl/ (props changed) projects/multi-fibv6/8/usr.sbin/ipfwpcap/ (props changed) projects/multi-fibv6/8/usr.sbin/jail/ (props changed) projects/multi-fibv6/8/usr.sbin/jexec/ (props changed) projects/multi-fibv6/8/usr.sbin/jls/ (props changed) projects/multi-fibv6/8/usr.sbin/kbdcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/kbdmap/ (props changed) projects/multi-fibv6/8/usr.sbin/kernbb/ (props changed) projects/multi-fibv6/8/usr.sbin/keyserv/ (props changed) projects/multi-fibv6/8/usr.sbin/kgmon/ (props changed) projects/multi-fibv6/8/usr.sbin/kgzip/ (props changed) projects/multi-fibv6/8/usr.sbin/kldxref/ (props changed) projects/multi-fibv6/8/usr.sbin/lastlogin/ (props changed) projects/multi-fibv6/8/usr.sbin/lmcconfig/ (props changed) projects/multi-fibv6/8/usr.sbin/lpr/ (props changed) projects/multi-fibv6/8/usr.sbin/lptcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/mailstats/ (props changed) projects/multi-fibv6/8/usr.sbin/mailwrapper/ (props changed) projects/multi-fibv6/8/usr.sbin/makefs/ (props changed) projects/multi-fibv6/8/usr.sbin/makemap/ (props changed) projects/multi-fibv6/8/usr.sbin/manctl/ (props changed) projects/multi-fibv6/8/usr.sbin/memcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/mergemaster/ (props changed) projects/multi-fibv6/8/usr.sbin/mfiutil/ (props changed) projects/multi-fibv6/8/usr.sbin/mixer/ (props changed) projects/multi-fibv6/8/usr.sbin/mld6query/ (props changed) projects/multi-fibv6/8/usr.sbin/mlxcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/mount_nwfs/ (props changed) projects/multi-fibv6/8/usr.sbin/mount_portalfs/ (props changed) projects/multi-fibv6/8/usr.sbin/mount_smbfs/ (props changed) projects/multi-fibv6/8/usr.sbin/mountd/ (props changed) projects/multi-fibv6/8/usr.sbin/moused/ (props changed) projects/multi-fibv6/8/usr.sbin/mptable/ (props changed) projects/multi-fibv6/8/usr.sbin/mptutil/ (props changed) projects/multi-fibv6/8/usr.sbin/mtest/ (props changed) projects/multi-fibv6/8/usr.sbin/mtree/ (props changed) projects/multi-fibv6/8/usr.sbin/named/ (props changed) projects/multi-fibv6/8/usr.sbin/named-checkconf/ (props changed) projects/multi-fibv6/8/usr.sbin/named-checkzone/ (props changed) projects/multi-fibv6/8/usr.sbin/named.reload/ (props changed) projects/multi-fibv6/8/usr.sbin/ndiscvt/ (props changed) projects/multi-fibv6/8/usr.sbin/ndp/ (props changed) projects/multi-fibv6/8/usr.sbin/newsyslog/ (props changed) projects/multi-fibv6/8/usr.sbin/nfscbd/ (props changed) projects/multi-fibv6/8/usr.sbin/nfsd/ (props changed) projects/multi-fibv6/8/usr.sbin/nfsdumpstate/ (props changed) projects/multi-fibv6/8/usr.sbin/nfsrevoke/ (props changed) projects/multi-fibv6/8/usr.sbin/nfsuserd/ (props changed) projects/multi-fibv6/8/usr.sbin/ngctl/ (props changed) projects/multi-fibv6/8/usr.sbin/nghook/ (props changed) projects/multi-fibv6/8/usr.sbin/nologin/ (props changed) projects/multi-fibv6/8/usr.sbin/nscd/ (props changed) projects/multi-fibv6/8/usr.sbin/ntp/ (props changed) projects/multi-fibv6/8/usr.sbin/nvram/ (props changed) projects/multi-fibv6/8/usr.sbin/ofwdump/ (props changed) projects/multi-fibv6/8/usr.sbin/pciconf/ (props changed) projects/multi-fibv6/8/usr.sbin/periodic/ (props changed) projects/multi-fibv6/8/usr.sbin/pkg_install/ (props changed) projects/multi-fibv6/8/usr.sbin/pkg_install/add/ (props changed) projects/multi-fibv6/8/usr.sbin/pkg_install/info/ (props changed) projects/multi-fibv6/8/usr.sbin/pmcannotate/ (props changed) projects/multi-fibv6/8/usr.sbin/pmccontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/pmcstat/ (props changed) projects/multi-fibv6/8/usr.sbin/pnpinfo/ (props changed) projects/multi-fibv6/8/usr.sbin/portsnap/ (props changed) projects/multi-fibv6/8/usr.sbin/powerd/ (props changed) projects/multi-fibv6/8/usr.sbin/ppp/ (props changed) projects/multi-fibv6/8/usr.sbin/pppctl/ (props changed) projects/multi-fibv6/8/usr.sbin/praliases/ (props changed) projects/multi-fibv6/8/usr.sbin/praudit/ (props changed) projects/multi-fibv6/8/usr.sbin/procctl/ (props changed) projects/multi-fibv6/8/usr.sbin/pstat/ (props changed) projects/multi-fibv6/8/usr.sbin/pw/ (props changed) projects/multi-fibv6/8/usr.sbin/pwd_mkdb/ (props changed) projects/multi-fibv6/8/usr.sbin/quot/ (props changed) projects/multi-fibv6/8/usr.sbin/quotaon/ (props changed) projects/multi-fibv6/8/usr.sbin/rarpd/ (props changed) projects/multi-fibv6/8/usr.sbin/repquota/ (props changed) projects/multi-fibv6/8/usr.sbin/rip6query/ (props changed) projects/multi-fibv6/8/usr.sbin/rmt/ (props changed) projects/multi-fibv6/8/usr.sbin/rndc/ (props changed) projects/multi-fibv6/8/usr.sbin/rndc-confgen/ (props changed) projects/multi-fibv6/8/usr.sbin/route6d/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.lockd/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.statd/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.umntall/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.yppasswdd/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.ypupdated/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.ypxfrd/ (props changed) projects/multi-fibv6/8/usr.sbin/rpcbind/ (props changed) projects/multi-fibv6/8/usr.sbin/rrenumd/ (props changed) projects/multi-fibv6/8/usr.sbin/rtadvctl/ (props changed) projects/multi-fibv6/8/usr.sbin/rtadvd/ (props changed) projects/multi-fibv6/8/usr.sbin/rtprio/ (props changed) projects/multi-fibv6/8/usr.sbin/rtsold/ (props changed) projects/multi-fibv6/8/usr.sbin/rwhod/ (props changed) projects/multi-fibv6/8/usr.sbin/sa/ (props changed) projects/multi-fibv6/8/usr.sbin/sade/ (props changed) projects/multi-fibv6/8/usr.sbin/sendmail/ (props changed) projects/multi-fibv6/8/usr.sbin/service/ (props changed) projects/multi-fibv6/8/usr.sbin/service/Makefile (props changed) projects/multi-fibv6/8/usr.sbin/service/service.8 (props changed) projects/multi-fibv6/8/usr.sbin/service/service.sh (props changed) projects/multi-fibv6/8/usr.sbin/services_mkdb/ (props changed) projects/multi-fibv6/8/usr.sbin/services_mkdb/Makefile (props changed) projects/multi-fibv6/8/usr.sbin/services_mkdb/services_mkdb.8 (props changed) projects/multi-fibv6/8/usr.sbin/services_mkdb/services_mkdb.c (props changed) projects/multi-fibv6/8/usr.sbin/services_mkdb/uniq.c (props changed) projects/multi-fibv6/8/usr.sbin/setfib/ (props changed) projects/multi-fibv6/8/usr.sbin/setfmac/ (props changed) projects/multi-fibv6/8/usr.sbin/setpmac/ (props changed) projects/multi-fibv6/8/usr.sbin/sicontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/smbmsg/ (props changed) projects/multi-fibv6/8/usr.sbin/snapinfo/ (props changed) projects/multi-fibv6/8/usr.sbin/spkrtest/ (props changed) projects/multi-fibv6/8/usr.sbin/spray/ (props changed) projects/multi-fibv6/8/usr.sbin/sysinstall/ (props changed) projects/multi-fibv6/8/usr.sbin/syslogd/ (props changed) projects/multi-fibv6/8/usr.sbin/tcpdchk/ (props changed) projects/multi-fibv6/8/usr.sbin/tcpdmatch/ (props changed) projects/multi-fibv6/8/usr.sbin/tcpdrop/ (props changed) projects/multi-fibv6/8/usr.sbin/tcpdump/ (props changed) projects/multi-fibv6/8/usr.sbin/timed/ (props changed) projects/multi-fibv6/8/usr.sbin/traceroute/ (props changed) projects/multi-fibv6/8/usr.sbin/traceroute6/ (props changed) projects/multi-fibv6/8/usr.sbin/trpt/ (props changed) projects/multi-fibv6/8/usr.sbin/tzsetup/ (props changed) projects/multi-fibv6/8/usr.sbin/uathload/ (props changed) projects/multi-fibv6/8/usr.sbin/ugidfw/ (props changed) projects/multi-fibv6/8/usr.sbin/uhsoctl/ (props changed) projects/multi-fibv6/8/usr.sbin/usbconfig/ (props changed) projects/multi-fibv6/8/usr.sbin/usbdevs/ (props changed) projects/multi-fibv6/8/usr.sbin/usbdump/ (props changed) projects/multi-fibv6/8/usr.sbin/usbdump/Makefile (props changed) projects/multi-fibv6/8/usr.sbin/usbdump/usbdump.8 (props changed) projects/multi-fibv6/8/usr.sbin/usbdump/usbdump.c (props changed) projects/multi-fibv6/8/usr.sbin/vidcontrol/ (props changed) projects/multi-fibv6/8/usr.sbin/vipw/ (props changed) projects/multi-fibv6/8/usr.sbin/wake/ (props changed) projects/multi-fibv6/8/usr.sbin/watch/ (props changed) projects/multi-fibv6/8/usr.sbin/watchdogd/ (props changed) projects/multi-fibv6/8/usr.sbin/wlandebug/ (props changed) projects/multi-fibv6/8/usr.sbin/wlconfig/ (props changed) projects/multi-fibv6/8/usr.sbin/wpa/ (props changed) projects/multi-fibv6/8/usr.sbin/yp_mkdb/ (props changed) projects/multi-fibv6/8/usr.sbin/ypbind/ (props changed) projects/multi-fibv6/8/usr.sbin/yppoll/ (props changed) projects/multi-fibv6/8/usr.sbin/yppush/ (props changed) projects/multi-fibv6/8/usr.sbin/ypserv/ (props changed) projects/multi-fibv6/8/usr.sbin/ypset/ (props changed) projects/multi-fibv6/8/usr.sbin/zic/ (props changed) projects/multi-fibv6/8/usr.sbin/zzz/ (props changed) Modified: projects/multi-fibv6/8/etc/rc.subr ============================================================================== --- projects/multi-fibv6/8/etc/rc.subr Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/etc/rc.subr Mon Mar 5 17:58:58 2012 (r232557) @@ -1027,9 +1027,9 @@ run_rc_script() if [ -n "$rc_fast_and_loose" ]; then set $_arg; . $_file else - ( trap "echo Script $_file interrupted; kill -QUIT $$" 3 - trap "echo Script $_file interrupted; exit 1" 2 - trap "echo Script $_file running" 29 + ( trap "echo Script $_file interrupted >&2 ; kill -QUIT $$" 3 + trap "echo Script $_file interrupted >&2 ; exit 1" 2 + trap "echo Script $_file running >&2" 29 set $_arg; . $_file ) fi fi Modified: projects/multi-fibv6/8/sbin/route/route.c ============================================================================== --- projects/multi-fibv6/8/sbin/route/route.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sbin/route/route.c Mon Mar 5 17:58:58 2012 (r232557) @@ -460,8 +460,8 @@ netname(struct sockaddr *sa) * Guess at the subnet mask, assuming reasonable * width subnet fields. */ - while (in.s_addr &~ mask) - mask = (long)mask >> subnetshift; + while (in.s_addr & ~mask) + mask |= mask >> subnetshift; net = in.s_addr & mask; while ((mask & 1) == 0) mask >>= 1, net >>= 1; Modified: projects/multi-fibv6/8/share/man/man4/lagg.4 ============================================================================== --- projects/multi-fibv6/8/share/man/man4/lagg.4 Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/share/man/man4/lagg.4 Mon Mar 5 17:58:58 2012 (r232557) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 18, 2010 +.Dd February 23, 2012 .Dt LAGG 4 .Os .Sh NAME @@ -133,6 +133,21 @@ variable in .Pp The MTU of the first interface to be added is used as the lagg MTU. All additional interfaces are required to have exactly the same value. +.Pp +The +.Ic loadbalance +and +.Ic lacp +modes will use the RSS hash from the network card if available to avoid +computing one, this may give poor traffic distribution if the hash is invalid +or uses less of the protocol header information. +Local hash computation can be forced per interface by setting the +.Va net.link.lagg.X.use_flowid +.Xr sysctl 8 +variable to zero where X is the interface number. +The default for new interfaces is set via the +.Va net.link.lagg.default_use_flowid +.Xr sysctl 8 . .Sh EXAMPLES Create a 802.3ad link aggregation using LACP with two .Xr bge 4 Modified: projects/multi-fibv6/8/sys/amd64/amd64/busdma_machdep.c ============================================================================== --- projects/multi-fibv6/8/sys/amd64/amd64/busdma_machdep.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/amd64/amd64/busdma_machdep.c Mon Mar 5 17:58:58 2012 (r232557) @@ -216,6 +216,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_dma_tag_t newtag; int error = 0; + /* Always enforce at least a 4GB boundary. */ + if (boundary == 0 || boundary > ((bus_addr_t)1 << 32)) + boundary = (bus_size_t)1 << 32; + /* Basic sanity checking */ if (boundary != 0 && boundary < maxsegsz) maxsegsz = boundary; Modified: projects/multi-fibv6/8/sys/dev/isci/isci.c ============================================================================== --- projects/multi-fibv6/8/sys/dev/isci/isci.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/dev/isci/isci.c Mon Mar 5 17:58:58 2012 (r232557) @@ -98,7 +98,11 @@ static struct _pcsid { 0x1d688086, "Intel(R) C600 Series Chipset SAS Controller" }, { 0x1d698086, "Intel(R) C600 Series Chipset SAS Controller" }, { 0x1d6a8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, - { 0x1d6b8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, + { 0x1d6b8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, + { 0x1d6c8086, "Intel(R) C600 Series Chipset SAS Controller" }, + { 0x1d6d8086, "Intel(R) C600 Series Chipset SAS Controller" }, + { 0x1d6e8086, "Intel(R) C600 Series Chipset SAS Controller" }, + { 0x1d6f8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" }, { 0x00000000, NULL } }; @@ -114,7 +118,7 @@ isci_probe (device_t device) if (ep->desc) { device_set_desc(device, ep->desc); - return (0); + return (BUS_PROBE_DEFAULT); } else return (ENXIO); Modified: projects/multi-fibv6/8/sys/dev/usb/serial/u3g.c ============================================================================== --- projects/multi-fibv6/8/sys/dev/usb/serial/u3g.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/dev/usb/serial/u3g.c Mon Mar 5 17:58:58 2012 (r232557) @@ -432,6 +432,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(QUANTA, Q111, 0), U3G_DEV(SIERRA, AC402, 0), U3G_DEV(SIERRA, AC595U, 0), + U3G_DEV(SIERRA, AC313U, 0), U3G_DEV(SIERRA, AC597E, 0), U3G_DEV(SIERRA, AC875E, 0), U3G_DEV(SIERRA, AC875U, 0), Modified: projects/multi-fibv6/8/sys/dev/usb/usbdevs ============================================================================== --- projects/multi-fibv6/8/sys/dev/usb/usbdevs Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/dev/usb/usbdevs Mon Mar 5 17:58:58 2012 (r232557) @@ -2989,6 +2989,7 @@ product SIERRA E6892 0x6892 E6892 product SIERRA E6893 0x6893 E6893 product SIERRA MC8700 0x68A3 MC8700 product SIERRA AIRCARD875 0x6820 Aircard 875 HSDPA +product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer /* Sigmatel products */ Modified: projects/multi-fibv6/8/sys/dev/xen/blkback/blkback.c ============================================================================== --- projects/multi-fibv6/8/sys/dev/xen/blkback/blkback.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/dev/xen/blkback/blkback.c Mon Mar 5 17:58:58 2012 (r232557) @@ -40,6 +40,8 @@ __FBSDID("$FreeBSD$"); * a FreeBSD domain to other domains. */ +#include "opt_kdtrace.h" + #include #include #include @@ -63,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -124,7 +127,7 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_XENBLOCKBACK, "xbbd", "Xen Block Back Driver Data"); #ifdef XBB_DEBUG -#define DPRINTF(fmt, args...) \ +#define DPRINTF(fmt, args...) \ printf("xbb(%s:%d): " fmt, __FUNCTION__, __LINE__, ##args) #else #define DPRINTF(fmt, args...) do {} while(0) @@ -134,7 +137,7 @@ MALLOC_DEFINE(M_XENBLOCKBACK, "xbbd", "X * The maximum mapped region size per request we will allow in a negotiated * block-front/back communication channel. */ -#define XBB_MAX_REQUEST_SIZE \ +#define XBB_MAX_REQUEST_SIZE \ MIN(MAXPHYS, BLKIF_MAX_SEGMENTS_PER_REQUEST * PAGE_SIZE) /** @@ -142,9 +145,9 @@ MALLOC_DEFINE(M_XENBLOCKBACK, "xbbd", "X * segment blocks) per request we will allow in a negotiated block-front/back * communication channel. */ -#define XBB_MAX_SEGMENTS_PER_REQUEST \ - (MIN(UIO_MAXIOV, \ - MIN(BLKIF_MAX_SEGMENTS_PER_REQUEST, \ +#define XBB_MAX_SEGMENTS_PER_REQUEST \ + (MIN(UIO_MAXIOV, \ + MIN(BLKIF_MAX_SEGMENTS_PER_REQUEST, \ (XBB_MAX_REQUEST_SIZE / PAGE_SIZE) + 1))) /** @@ -980,9 +983,10 @@ xbb_get_gntaddr(struct xbb_xen_reqlist * static uint8_t * xbb_get_kva(struct xbb_softc *xbb, int nr_pages) { - intptr_t first_clear, num_clear; + intptr_t first_clear; + intptr_t num_clear; uint8_t *free_kva; - int i; + int i; KASSERT(nr_pages != 0, ("xbb_get_kva of zero length")); @@ -1681,19 +1685,19 @@ xbb_dispatch_io(struct xbb_softc *xbb, s req_ring_idx++; switch (xbb->abi) { case BLKIF_PROTOCOL_NATIVE: - sg = BLKRING_GET_SG_REQUEST(&xbb->rings.native, - req_ring_idx); + sg = BLKRING_GET_SEG_BLOCK(&xbb->rings.native, + req_ring_idx); break; case BLKIF_PROTOCOL_X86_32: { - sg = BLKRING_GET_SG_REQUEST(&xbb->rings.x86_32, - req_ring_idx); + sg = BLKRING_GET_SEG_BLOCK(&xbb->rings.x86_32, + req_ring_idx); break; } case BLKIF_PROTOCOL_X86_64: { - sg = BLKRING_GET_SG_REQUEST(&xbb->rings.x86_64, - req_ring_idx); + sg = BLKRING_GET_SEG_BLOCK(&xbb->rings.x86_64, + req_ring_idx); break; } default: @@ -1817,8 +1821,8 @@ xbb_run_queue(void *context, int pending struct xbb_xen_reqlist *reqlist; - xbb = (struct xbb_softc *)context; - rings = &xbb->rings; + xbb = (struct xbb_softc *)context; + rings = &xbb->rings; /* * Work gather and dispatch loop. Note that we have a bias here @@ -2032,6 +2036,13 @@ xbb_intr(void *arg) taskqueue_enqueue(xbb->io_taskqueue, &xbb->io_task); } +SDT_PROVIDER_DEFINE(xbb); +SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_dev, flush, flush, "int"); +SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, read, read, "int", "uint64_t", + "uint64_t"); +SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, write, write, "int", + "uint64_t", "uint64_t"); + /*----------------------------- Backend Handlers -----------------------------*/ /** * Backend handler for character device access. @@ -2087,6 +2098,9 @@ xbb_dispatch_dev(struct xbb_softc *xbb, nreq->pendcnt = 1; + SDT_PROBE1(xbb, kernel, xbb_dispatch_dev, flush, + device_get_unit(xbb->dev)); + (*dev_data->csw->d_strategy)(bio); return (0); @@ -2181,6 +2195,17 @@ xbb_dispatch_dev(struct xbb_softc *xbb, bios[bio_idx]->bio_bcount); } #endif + if (operation == BIO_READ) { + SDT_PROBE3(xbb, kernel, xbb_dispatch_dev, read, + device_get_unit(xbb->dev), + bios[bio_idx]->bio_offset, + bios[bio_idx]->bio_length); + } else if (operation == BIO_WRITE) { + SDT_PROBE3(xbb, kernel, xbb_dispatch_dev, write, + device_get_unit(xbb->dev), + bios[bio_idx]->bio_offset, + bios[bio_idx]->bio_length); + } (*dev_data->csw->d_strategy)(bios[bio_idx]); } @@ -2193,6 +2218,12 @@ fail_free_bios: return (error); } +SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_file, flush, flush, "int"); +SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, read, read, "int", "uint64_t", + "uint64_t"); +SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, write, write, "int", + "uint64_t", "uint64_t"); + /** * Backend handler for file access. * @@ -2237,6 +2268,9 @@ xbb_dispatch_file(struct xbb_softc *xbb, case BIO_FLUSH: { struct mount *mountpoint; + SDT_PROBE1(xbb, kernel, xbb_dispatch_file, flush, + device_get_unit(xbb->dev)); + vfs_is_locked = VFS_LOCK_GIANT(xbb->vn->v_mount); (void) vn_start_write(xbb->vn, &mountpoint, V_WAIT); @@ -2336,6 +2370,10 @@ xbb_dispatch_file(struct xbb_softc *xbb, switch (operation) { case BIO_READ: + SDT_PROBE3(xbb, kernel, xbb_dispatch_file, read, + device_get_unit(xbb->dev), xuio.uio_offset, + xuio.uio_resid); + vn_lock(xbb->vn, LK_EXCLUSIVE | LK_RETRY); /* @@ -2366,6 +2404,10 @@ xbb_dispatch_file(struct xbb_softc *xbb, case BIO_WRITE: { struct mount *mountpoint; + SDT_PROBE3(xbb, kernel, xbb_dispatch_file, write, + device_get_unit(xbb->dev), xuio.uio_offset, + xuio.uio_resid); + (void)vn_start_write(xbb->vn, &mountpoint, V_WAIT); vn_lock(xbb->vn, LK_EXCLUSIVE | LK_RETRY); @@ -3028,6 +3070,8 @@ xbb_collect_frontend_info(struct xbb_sof const char *otherend_path; int error; u_int ring_idx; + u_int ring_page_order; + size_t ring_size; otherend_path = xenbus_get_otherend_path(xbb->dev); @@ -3035,23 +3079,19 @@ xbb_collect_frontend_info(struct xbb_sof * Protocol defaults valid even if all negotiation fails. */ xbb->ring_config.ring_pages = 1; - xbb->max_requests = BLKIF_MAX_RING_REQUESTS(PAGE_SIZE); xbb->max_request_segments = BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK; xbb->max_request_size = xbb->max_request_segments * PAGE_SIZE; /* * Mandatory data (used in all versions of the protocol) first. */ - error = xs_gather(XST_NIL, otherend_path, - "ring-ref", "%" PRIu32, - &xbb->ring_config.ring_ref[0], - "event-channel", "%" PRIu32, - &xbb->ring_config.evtchn, - NULL); + error = xs_scanf(XST_NIL, otherend_path, + "event-channel", NULL, "%" PRIu32, + &xbb->ring_config.evtchn); if (error != 0) { xenbus_dev_fatal(xbb->dev, error, - "Unable to retrieve ring information from " - "frontend %s. Unable to connect.", + "Unable to retrieve event-channel information " + "from frontend %s. Unable to connect.", xenbus_get_otherend_path(xbb->dev)); return (error); } @@ -3065,10 +3105,20 @@ xbb_collect_frontend_info(struct xbb_sof * we must use independant calls in order to guarantee * we don't miss information in a sparsly populated front-end * tree. + * + * \note xs_scanf() does not update variables for unmatched + * fields. */ + ring_page_order = 0; + (void)xs_scanf(XST_NIL, otherend_path, + "ring-page-order", NULL, "%u", + &ring_page_order); + xbb->ring_config.ring_pages = 1 << ring_page_order; (void)xs_scanf(XST_NIL, otherend_path, - "ring-pages", NULL, "%u", + "num-ring-pages", NULL, "%u", &xbb->ring_config.ring_pages); + ring_size = PAGE_SIZE * xbb->ring_config.ring_pages; + xbb->max_requests = BLKIF_MAX_RING_REQUESTS(ring_size); (void)xs_scanf(XST_NIL, otherend_path, "max-requests", NULL, "%u", @@ -3084,7 +3134,7 @@ xbb_collect_frontend_info(struct xbb_sof if (xbb->ring_config.ring_pages > XBB_MAX_RING_PAGES) { xenbus_dev_fatal(xbb->dev, EINVAL, - "Front-end specificed ring-pages of %u " + "Front-end specified ring-pages of %u " "exceeds backend limit of %zu. " "Unable to connect.", xbb->ring_config.ring_pages, @@ -3092,7 +3142,7 @@ xbb_collect_frontend_info(struct xbb_sof return (EINVAL); } else if (xbb->max_requests > XBB_MAX_REQUESTS) { xenbus_dev_fatal(xbb->dev, EINVAL, - "Front-end specificed max_requests of %u " + "Front-end specified max_requests of %u " "exceeds backend limit of %u. " "Unable to connect.", xbb->max_requests, @@ -3100,7 +3150,7 @@ xbb_collect_frontend_info(struct xbb_sof return (EINVAL); } else if (xbb->max_request_segments > XBB_MAX_SEGMENTS_PER_REQUEST) { xenbus_dev_fatal(xbb->dev, EINVAL, - "Front-end specificed max_requests_segments " + "Front-end specified max_requests_segments " "of %u exceeds backend limit of %u. " "Unable to connect.", xbb->max_request_segments, @@ -3108,7 +3158,7 @@ xbb_collect_frontend_info(struct xbb_sof return (EINVAL); } else if (xbb->max_request_size > XBB_MAX_REQUEST_SIZE) { xenbus_dev_fatal(xbb->dev, EINVAL, - "Front-end specificed max_request_size " + "Front-end specified max_request_size " "of %u exceeds backend limit of %u. " "Unable to connect.", xbb->max_request_size, @@ -3116,22 +3166,39 @@ xbb_collect_frontend_info(struct xbb_sof return (EINVAL); } - /* If using a multi-page ring, pull in the remaining references. */ - for (ring_idx = 1; ring_idx < xbb->ring_config.ring_pages; ring_idx++) { - char ring_ref_name[]= "ring_refXX"; - - snprintf(ring_ref_name, sizeof(ring_ref_name), - "ring-ref%u", ring_idx); - error = xs_scanf(XST_NIL, otherend_path, - ring_ref_name, NULL, "%" PRIu32, - &xbb->ring_config.ring_ref[ring_idx]); + if (xbb->ring_config.ring_pages == 1) { + error = xs_gather(XST_NIL, otherend_path, + "ring-ref", "%" PRIu32, + &xbb->ring_config.ring_ref[0], + NULL); if (error != 0) { xenbus_dev_fatal(xbb->dev, error, - "Failed to retriev grant reference " - "for page %u of shared ring. Unable " - "to connect.", ring_idx); + "Unable to retrieve ring information " + "from frontend %s. Unable to " + "connect.", + xenbus_get_otherend_path(xbb->dev)); return (error); } + } else { + /* Multi-page ring format. */ + for (ring_idx = 0; ring_idx < xbb->ring_config.ring_pages; + ring_idx++) { + char ring_ref_name[]= "ring_refXX"; + + snprintf(ring_ref_name, sizeof(ring_ref_name), + "ring-ref%u", ring_idx); + error = xs_scanf(XST_NIL, otherend_path, + ring_ref_name, NULL, "%" PRIu32, + &xbb->ring_config.ring_ref[ring_idx]); + if (error != 0) { + xenbus_dev_fatal(xbb->dev, error, + "Failed to retriev grant " + "reference for page %u of " + "shared ring. Unable " + "to connect.", ring_idx); + return (error); + } + } } error = xs_gather(XST_NIL, otherend_path, @@ -3197,8 +3264,8 @@ xbb_alloc_requests(struct xbb_softc *xbb static int xbb_alloc_request_lists(struct xbb_softc *xbb) { - int i; struct xbb_xen_reqlist *reqlist; + int i; /* * If no requests can be merged, we need 1 request list per @@ -3318,7 +3385,7 @@ xbb_publish_backend_info(struct xbb_soft static void xbb_connect(struct xbb_softc *xbb) { - int error; + int error; if (xenbus_get_state(xbb->dev) == XenbusStateConnected) return; @@ -3399,7 +3466,8 @@ xbb_connect(struct xbb_softc *xbb) static int xbb_shutdown(struct xbb_softc *xbb) { - int error; + XenbusState frontState; + int error; DPRINTF("\n"); @@ -3413,6 +3481,20 @@ xbb_shutdown(struct xbb_softc *xbb) if ((xbb->flags & XBBF_IN_SHUTDOWN) != 0) return (EAGAIN); + xbb->flags |= XBBF_IN_SHUTDOWN; + mtx_unlock(&xbb->lock); + + if (xenbus_get_state(xbb->dev) < XenbusStateClosing) + xenbus_set_state(xbb->dev, XenbusStateClosing); + + frontState = xenbus_get_otherend_state(xbb->dev); + mtx_lock(&xbb->lock); + xbb->flags &= ~XBBF_IN_SHUTDOWN; + + /* The front can submit I/O until entering the closed state. */ + if (frontState < XenbusStateClosed) + return (EAGAIN); + DPRINTF("\n"); /* Indicate shutdown is in progress. */ @@ -3434,19 +3516,6 @@ xbb_shutdown(struct xbb_softc *xbb) DPRINTF("\n"); - /* - * Before unlocking mutex, set this flag to prevent other threads from - * getting into this function - */ - xbb->flags |= XBBF_IN_SHUTDOWN; - mtx_unlock(&xbb->lock); - - if (xenbus_get_state(xbb->dev) < XenbusStateClosing) - xenbus_set_state(xbb->dev, XenbusStateClosing); - - mtx_lock(&xbb->lock); - xbb->flags &= ~XBBF_IN_SHUTDOWN; - /* Indicate to xbb_detach() that is it safe to proceed. */ wakeup(xbb); @@ -3573,6 +3642,16 @@ xbb_setup_sysctl(struct xbb_softc *xbb) "max_request_segments", CTLFLAG_RD, &xbb->max_request_segments, 0, "maximum number of pages per requests (negotiated)"); + + SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "max_request_size", CTLFLAG_RD, + &xbb->max_request_size, 0, + "maximum size in bytes of a request (negotiated)"); + + SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "ring_pages", CTLFLAG_RD, + &xbb->ring_config.ring_pages, 0, + "communication channel pages (negotiated)"); } /** @@ -3587,6 +3666,7 @@ xbb_attach(device_t dev) { struct xbb_softc *xbb; int error; + u_int max_ring_page_order; DPRINTF("Attaching to %s\n", xenbus_get_node(dev)); @@ -3621,6 +3701,10 @@ xbb_attach(device_t dev) return (error); } + /* + * Amazon EC2 client compatility. They refer to max-ring-pages + * instead of to max-ring-page-order. + */ error = xs_printf(XST_NIL, xenbus_get_node(xbb->dev), "max-ring-pages", "%zu", XBB_MAX_RING_PAGES); if (error) { @@ -3629,6 +3713,15 @@ xbb_attach(device_t dev) return (error); } + max_ring_page_order = flsl(XBB_MAX_RING_PAGES) - 1; + error = xs_printf(XST_NIL, xenbus_get_node(xbb->dev), + "max-ring-page-order", "%u", max_ring_page_order); + if (error) { + xbb_attach_failed(xbb, error, "writing %s/max-ring-page-order", + xenbus_get_node(xbb->dev)); + return (error); + } + error = xs_printf(XST_NIL, xenbus_get_node(xbb->dev), "max-requests", "%u", XBB_MAX_REQUESTS); if (error) { Modified: projects/multi-fibv6/8/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- projects/multi-fibv6/8/sys/dev/xen/blkfront/blkfront.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/dev/xen/blkfront/blkfront.c Mon Mar 5 17:58:58 2012 (r232557) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -139,7 +140,7 @@ static int xb_dump(void *, void *, vm_of * with blkfront as the emulated drives, easing transition slightly. */ static void -blkfront_vdevice_to_unit(int vdevice, int *unit, const char **name) +blkfront_vdevice_to_unit(uint32_t vdevice, int *unit, const char **name) { static struct vdev_info { int major; @@ -186,6 +187,7 @@ blkfront_vdevice_to_unit(int vdevice, in if (vdevice & (1 << 28)) { *unit = (vdevice & ((1 << 28) - 1)) >> 8; *name = "xbd"; + return; } for (i = 0; info[i].major; i++) { @@ -407,6 +409,40 @@ blkfront_probe(device_t dev) return (ENXIO); } +static void +xb_setup_sysctl(struct xb_softc *xb) +{ + struct sysctl_ctx_list *sysctl_ctx = NULL; + struct sysctl_oid *sysctl_tree = NULL; + + sysctl_ctx = device_get_sysctl_ctx(xb->xb_dev); + if (sysctl_ctx == NULL) + return; + + sysctl_tree = device_get_sysctl_tree(xb->xb_dev); + if (sysctl_tree == NULL) + return; + + SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "max_requests", CTLFLAG_RD, &xb->max_requests, -1, + "maximum outstanding requests (negotiated)"); + + SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "max_request_segments", CTLFLAG_RD, + &xb->max_request_segments, 0, + "maximum number of pages per requests (negotiated)"); + + SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "max_request_size", CTLFLAG_RD, + &xb->max_request_size, 0, + "maximum size in bytes of a request (negotiated)"); + + SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "ring_pages", CTLFLAG_RD, + &xb->ring_pages, 0, + "communication channel pages (negotiated)"); +} + /* * Setup supplies the backend dir, virtual device. We place an event * channel and shared frame entries. We watch backend to wait if it's @@ -417,14 +453,14 @@ blkfront_attach(device_t dev) { struct xb_softc *sc; const char *name; + uint32_t vdevice; int error; - int vdevice; int i; int unit; /* FIXME: Use dynamic device id if this is not set. */ error = xs_scanf(XST_NIL, xenbus_get_node(dev), - "virtual-device", NULL, "%i", &vdevice); + "virtual-device", NULL, "%" PRIu32, &vdevice); if (error) { xenbus_dev_fatal(dev, error, "reading virtual-device"); device_printf(dev, "Couldn't determine virtual device.\n"); @@ -449,6 +485,8 @@ blkfront_attach(device_t dev) sc->vdevice = vdevice; sc->connected = BLKIF_STATE_DISCONNECTED; + xb_setup_sysctl(sc); + /* Wait for backend device to publish its protocol capabilities. */ xenbus_set_state(dev, XenbusStateInitialising); @@ -501,6 +539,7 @@ blkfront_initialize(struct xb_softc *sc) { const char *otherend_path; const char *node_path; + uint32_t max_ring_page_order; int error; int i; @@ -513,10 +552,10 @@ blkfront_initialize(struct xb_softc *sc) * Protocol defaults valid even if negotiation for a * setting fails. */ + max_ring_page_order = 0; sc->ring_pages = 1; - sc->max_requests = BLKIF_MAX_RING_REQUESTS(PAGE_SIZE); sc->max_request_segments = BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK; - sc->max_request_size = (sc->max_request_segments - 1) * PAGE_SIZE; + sc->max_request_size = XBF_SEGS_TO_SIZE(sc->max_request_segments); sc->max_request_blocks = BLKIF_SEGS_TO_BLOCKS(sc->max_request_segments); /* @@ -526,13 +565,25 @@ blkfront_initialize(struct xb_softc *sc) * we must use independant calls in order to guarantee * we don't miss information in a sparsly populated back-end * tree. + * + * \note xs_scanf() does not update variables for unmatched + * fields. */ otherend_path = xenbus_get_otherend_path(sc->xb_dev); node_path = xenbus_get_node(sc->xb_dev); + + /* Support both backend schemes for relaying ring page limits. */ + (void)xs_scanf(XST_NIL, otherend_path, + "max-ring-page-order", NULL, "%" PRIu32, + &max_ring_page_order); + sc->ring_pages = 1 << max_ring_page_order; (void)xs_scanf(XST_NIL, otherend_path, "max-ring-pages", NULL, "%" PRIu32, &sc->ring_pages); + if (sc->ring_pages < 1) + sc->ring_pages = 1; + sc->max_requests = BLKIF_MAX_RING_REQUESTS(sc->ring_pages * PAGE_SIZE); (void)xs_scanf(XST_NIL, otherend_path, "max-requests", NULL, "%" PRIu32, &sc->max_requests); @@ -552,6 +603,16 @@ blkfront_initialize(struct xb_softc *sc) sc->ring_pages = XBF_MAX_RING_PAGES; } + if (powerof2(sc->ring_pages) == 0) { + uint32_t new_page_limit; + + new_page_limit = 0x01 << (fls(sc->ring_pages) - 1); + device_printf(sc->xb_dev, "Back-end specified ring-pages of " + "%u is not a power of 2. Limited to %u.\n", + sc->ring_pages, new_page_limit); + sc->ring_pages = new_page_limit; + } + if (sc->max_requests > XBF_MAX_REQUESTS) { device_printf(sc->xb_dev, "Back-end specified max_requests of " "%u limited to front-end limit of %u.\n", @@ -560,8 +621,8 @@ blkfront_initialize(struct xb_softc *sc) } if (sc->max_request_segments > XBF_MAX_SEGMENTS_PER_REQUEST) { - device_printf(sc->xb_dev, "Back-end specificed " - "max_requests_segments of %u limited to " + device_printf(sc->xb_dev, "Back-end specified " + "max_request_segments of %u limited to " "front-end limit of %u.\n", sc->max_request_segments, XBF_MAX_SEGMENTS_PER_REQUEST); @@ -569,12 +630,23 @@ blkfront_initialize(struct xb_softc *sc) } if (sc->max_request_size > XBF_MAX_REQUEST_SIZE) { - device_printf(sc->xb_dev, "Back-end specificed " + device_printf(sc->xb_dev, "Back-end specified " "max_request_size of %u limited to front-end " "limit of %u.\n", sc->max_request_size, XBF_MAX_REQUEST_SIZE); sc->max_request_size = XBF_MAX_REQUEST_SIZE; } + + if (sc->max_request_size > XBF_SEGS_TO_SIZE(sc->max_request_segments)) { + device_printf(sc->xb_dev, "Back-end specified " + "max_request_size of %u limited to front-end " + "limit of %u. (Too few segments.)\n", + sc->max_request_size, + XBF_SEGS_TO_SIZE(sc->max_request_segments)); + sc->max_request_size = + XBF_SEGS_TO_SIZE(sc->max_request_segments); + } + sc->max_request_blocks = BLKIF_SEGS_TO_BLOCKS(sc->max_request_segments); /* Allocate datastructures based on negotiated values. */ @@ -625,11 +697,20 @@ blkfront_initialize(struct xb_softc *sc) if (setup_blkring(sc) != 0) return; + /* Support both backend schemes for relaying ring page limits. */ error = xs_printf(XST_NIL, node_path, - "ring-pages","%u", sc->ring_pages); + "num-ring-pages","%u", sc->ring_pages); if (error) { xenbus_dev_fatal(sc->xb_dev, error, - "writing %s/ring-pages", + "writing %s/num-ring-pages", + node_path); + return; + } + error = xs_printf(XST_NIL, node_path, + "ring-page-order","%u", fls(sc->ring_pages) - 1); + if (error) { + xenbus_dev_fatal(sc->xb_dev, error, + "writing %s/ring-page-order", node_path); return; } @@ -711,25 +792,31 @@ setup_blkring(struct xb_softc *sc) return (error); } } - error = xs_printf(XST_NIL, xenbus_get_node(sc->xb_dev), - "ring-ref","%u", sc->ring_ref[0]); - if (error) { - xenbus_dev_fatal(sc->xb_dev, error, "writing %s/ring-ref", - xenbus_get_node(sc->xb_dev)); - return (error); - } - for (i = 1; i < sc->ring_pages; i++) { - char ring_ref_name[]= "ring_refXX"; - - snprintf(ring_ref_name, sizeof(ring_ref_name), "ring-ref%u", i); + if (sc->ring_pages == 1) { error = xs_printf(XST_NIL, xenbus_get_node(sc->xb_dev), - ring_ref_name, "%u", sc->ring_ref[i]); + "ring-ref", "%u", sc->ring_ref[0]); if (error) { - xenbus_dev_fatal(sc->xb_dev, error, "writing %s/%s", - xenbus_get_node(sc->xb_dev), - ring_ref_name); + xenbus_dev_fatal(sc->xb_dev, error, + "writing %s/ring-ref", + xenbus_get_node(sc->xb_dev)); return (error); } + } else { + for (i = 0; i < sc->ring_pages; i++) { + char ring_ref_name[]= "ring_refXX"; + + snprintf(ring_ref_name, sizeof(ring_ref_name), + "ring-ref%u", i); + error = xs_printf(XST_NIL, xenbus_get_node(sc->xb_dev), + ring_ref_name, "%u", sc->ring_ref[i]); + if (error) { + xenbus_dev_fatal(sc->xb_dev, error, + "writing %s/%s", + xenbus_get_node(sc->xb_dev), + ring_ref_name); + return (error); + } + } } error = bind_listening_port_to_irqhandler( @@ -795,7 +882,7 @@ blkfront_connect(struct xb_softc *sc) unsigned int binfo; int err, feature_barrier; - if( (sc->connected == BLKIF_STATE_CONNECTED) || + if( (sc->connected == BLKIF_STATE_CONNECTED) || (sc->connected == BLKIF_STATE_SUSPENDED) ) return; @@ -923,15 +1010,13 @@ blkif_close(struct disk *dp) return (ENXIO); sc->xb_flags &= ~XB_OPEN; if (--(sc->users) == 0) { - /* Check whether we have been instructed to close. We will - have ignored this request initially, as the device was - still mounted. */ - device_t dev = sc->xb_dev; - XenbusState state = - xenbus_read_driver_state(xenbus_get_otherend_path(dev)); - - if (state == XenbusStateClosing) - blkfront_closing(dev); + /* + * Check whether we have been instructed to close. We will + * have ignored this request initially, as the device was + * still mounted. + */ + if (xenbus_get_otherend_state(sc->xb_dev) == XenbusStateClosing) + blkfront_closing(sc->xb_dev); } return (0); } @@ -1033,7 +1118,7 @@ blkif_queue_cb(void *arg, bus_dma_segmen struct xb_command *cm; blkif_request_t *ring_req; struct blkif_request_segment *sg; - struct blkif_request_segment *last_block_sg; + struct blkif_request_segment *last_block_sg; grant_ref_t *sg_ref; vm_paddr_t buffer_ma; uint64_t fsect, lsect; @@ -1104,12 +1189,12 @@ blkif_queue_cb(void *arg, bus_dma_segmen nsegs--; } block_segs = MIN(nsegs, BLKIF_MAX_SEGMENTS_PER_SEGMENT_BLOCK); - if (block_segs == 0) - break; + if (block_segs == 0) + break; - sg = BLKRING_GET_SG_REQUEST(&sc->ring, sc->ring.req_prod_pvt); + sg = BLKRING_GET_SEG_BLOCK(&sc->ring, sc->ring.req_prod_pvt); sc->ring.req_prod_pvt++; - last_block_sg = sg + block_segs; + last_block_sg = sg + block_segs; } if (cm->operation == BLKIF_OP_READ) Modified: projects/multi-fibv6/8/sys/dev/xen/blkfront/block.h ============================================================================== --- projects/multi-fibv6/8/sys/dev/xen/blkfront/block.h Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/dev/xen/blkfront/block.h Mon Mar 5 17:58:58 2012 (r232557) @@ -35,6 +35,32 @@ #include /** + * Given a number of blkif segments, compute the maximum I/O size supported. + * + * \note This calculation assumes that all but the first and last segments + * of the I/O are fully utilized. + * + * \note We reserve a segement from the maximum supported by the transport to + * guarantee we can handle an unaligned transfer without the need to + * use a bounce buffer. + */ +#define XBF_SEGS_TO_SIZE(segs) \ + (((segs) - 1) * PAGE_SIZE) + +/** + * Compute the maximum number of blkif segments requried to represent + * an I/O of the given size. + * + * \note This calculation assumes that all but the first and last segments + * of the I/O are fully utilized. + * + * \note We reserve a segement to guarantee we can handle an unaligned + * transfer without the need to use a bounce buffer. + */ +#define XBF_SIZE_TO_SEGS(size) \ + ((size / PAGE_SIZE) + 1) + +/** * The maximum number of outstanding requests blocks (request headers plus * additional segment blocks) we will allow in a negotiated block-front/back * communication channel. @@ -44,22 +70,18 @@ /** * The maximum mapped region size per request we will allow in a negotiated * block-front/back communication channel. - * - * \note We reserve a segement from the maximum supported by the transport to - * guarantee we can handle an unaligned transfer without the need to - * use a bounce buffer.. */ -#define XBF_MAX_REQUEST_SIZE \ - MIN(MAXPHYS, (BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * PAGE_SIZE) +#define XBF_MAX_REQUEST_SIZE \ + MIN(MAXPHYS, XBF_SEGS_TO_SIZE(BLKIF_MAX_SEGMENTS_PER_REQUEST)) /** * The maximum number of segments (within a request header and accompanying * segment blocks) per request we will allow in a negotiated block-front/back * communication channel. */ -#define XBF_MAX_SEGMENTS_PER_REQUEST \ - (MIN(BLKIF_MAX_SEGMENTS_PER_REQUEST, \ - (XBF_MAX_REQUEST_SIZE / PAGE_SIZE) + 1)) +#define XBF_MAX_SEGMENTS_PER_REQUEST \ + (MIN(BLKIF_MAX_SEGMENTS_PER_REQUEST, \ + XBF_SIZE_TO_SEGS(XBF_MAX_REQUEST_SIZE))) /** * The maximum number of shared memory ring pages we will allow in a Modified: projects/multi-fibv6/8/sys/i386/i386/busdma_machdep.c ============================================================================== --- projects/multi-fibv6/8/sys/i386/i386/busdma_machdep.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/i386/i386/busdma_machdep.c Mon Mar 5 17:58:58 2012 (r232557) @@ -226,6 +226,12 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_dma_tag_t newtag; int error = 0; +#if defined(PAE) + /* Need at least a 4GB boundary, PAE limitations require 2GB */ + if (boundary == 0 || boundary > ((bus_addr_t)1 << 31)) + boundary = (bus_size_t)1 << 31; +#endif + /* Basic sanity checking */ if (boundary != 0 && boundary < maxsegsz) maxsegsz = boundary; Modified: projects/multi-fibv6/8/sys/net/ieee8023ad_lacp.c ============================================================================== --- projects/multi-fibv6/8/sys/net/ieee8023ad_lacp.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/net/ieee8023ad_lacp.c Mon Mar 5 17:58:58 2012 (r232557) @@ -812,7 +812,7 @@ lacp_select_tx_port(struct lagg_softc *s return (NULL); } - if (m->m_flags & M_FLOWID) + if (sc->use_flowid && (m->m_flags & M_FLOWID)) hash = m->m_pkthdr.flowid; else hash = lagg_hashmbuf(m, lsc->lsc_hashkey); Modified: projects/multi-fibv6/8/sys/net/if_lagg.c ============================================================================== --- projects/multi-fibv6/8/sys/net/if_lagg.c Mon Mar 5 17:51:57 2012 (r232556) +++ projects/multi-fibv6/8/sys/net/if_lagg.c Mon Mar 5 17:58:58 2012 (r232557) @@ -167,6 +167,11 @@ static int lagg_failover_rx_all = 0; /* SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW, &lagg_failover_rx_all, 0, "Accept input from any interface in a failover lagg"); +static int def_use_flowid = 1; /* Default value for using M_FLOWID */ +TUNABLE_INT("net.link.lagg.default_use_flowid", &def_use_flowid); +SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RW, + &def_use_flowid, 0, + "Default setting for using flow id for load sharing"); static int lagg_modevent(module_t mod, int type, void *data) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***