PERFORCE change 117742 for review

Sam Leffler sam at FreeBSD.org
Mon Apr 9 15:56:16 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=117742

Change 117742 by sam at sam_ebb on 2007/04/09 15:55:23

	IFC @ 117741

Affected files ...

.. //depot/projects/wifi/MAINTAINERS#14 integrate
.. //depot/projects/wifi/Makefile.inc1#32 integrate
.. //depot/projects/wifi/bin/df/df.c#5 integrate
.. //depot/projects/wifi/cddl/Makefile#1 branch
.. //depot/projects/wifi/cddl/Makefile.inc#1 branch
.. //depot/projects/wifi/cddl/lib/Makefile#1 branch
.. //depot/projects/wifi/cddl/lib/Makefile.inc#1 branch
.. //depot/projects/wifi/cddl/lib/libavl/Makefile#1 branch
.. //depot/projects/wifi/cddl/lib/libnvpair/Makefile#1 branch
.. //depot/projects/wifi/cddl/lib/libumem/Makefile#1 branch
.. //depot/projects/wifi/cddl/lib/libuutil/Makefile#1 branch
.. //depot/projects/wifi/cddl/lib/libzfs/Makefile#1 branch
.. //depot/projects/wifi/cddl/lib/libzpool/Makefile#1 branch
.. //depot/projects/wifi/cddl/sbin/Makefile#1 branch
.. //depot/projects/wifi/cddl/sbin/Makefile.inc#1 branch
.. //depot/projects/wifi/cddl/sbin/zfs/Makefile#1 branch
.. //depot/projects/wifi/cddl/sbin/zpool/Makefile#1 branch
.. //depot/projects/wifi/cddl/usr.bin/Makefile#1 branch
.. //depot/projects/wifi/cddl/usr.bin/Makefile.inc#1 branch
.. //depot/projects/wifi/cddl/usr.bin/ztest/Makefile#1 branch
.. //depot/projects/wifi/cddl/usr.sbin/Makefile#1 branch
.. //depot/projects/wifi/cddl/usr.sbin/Makefile.inc#1 branch
.. //depot/projects/wifi/cddl/usr.sbin/zdb/Makefile#1 branch
.. //depot/projects/wifi/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/wifi/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/wifi/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/wifi/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/wifi/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/wifi/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/wifi/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.h#2 integrate
.. //depot/projects/wifi/contrib/binutils/gas/as.h#2 integrate
.. //depot/projects/wifi/contrib/binutils/gas/tc.h#2 integrate
.. //depot/projects/wifi/contrib/openpam/lib/openpam_readline.c#3 integrate
.. //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb.8#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs.8#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool.8#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/cmd/ztest/ztest.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/head/assert.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/head/atomic.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/head/libintl.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/head/stdio_ext.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/head/synch.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/head/thread.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch
.. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/util.c#1 branch
.. //depot/projects/wifi/contrib/tcpdump/print-stp.c#3 integrate
.. //depot/projects/wifi/etc/defaults/periodic.conf#8 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#28 integrate
.. //depot/projects/wifi/etc/devd.conf#16 integrate
.. //depot/projects/wifi/etc/mtree/BSD.root.dist#5 integrate
.. //depot/projects/wifi/etc/periodic/daily/404.status-zfs#1 branch
.. //depot/projects/wifi/etc/periodic/daily/Makefile#4 integrate
.. //depot/projects/wifi/etc/rc.d/Makefile#18 integrate
.. //depot/projects/wifi/etc/rc.d/mountd#3 integrate
.. //depot/projects/wifi/etc/rc.d/zfs#1 branch
.. //depot/projects/wifi/etc/rc.firewall#6 integrate
.. //depot/projects/wifi/include/stdio.h#4 integrate
.. //depot/projects/wifi/lib/libarchive/Makefile#22 integrate
.. //depot/projects/wifi/lib/libarchive/archive_entry.c#14 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read.3#14 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read.c#13 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_data_into_buffer.c#4 delete
.. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#14 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_compress.c#6 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_none.c#6 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_support_format_all.c#6 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_disk.c#3 integrate
.. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#12 integrate
.. //depot/projects/wifi/lib/libarchive/test/Makefile#3 integrate
.. //depot/projects/wifi/lib/libc/gen/getvfsbyname.3#3 integrate
.. //depot/projects/wifi/lib/libc/resolv/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/resolv/res_debug.c#3 integrate
.. //depot/projects/wifi/lib/libc/sys/lseek.2#4 integrate
.. //depot/projects/wifi/lib/libc/sys/pathconf.2#4 integrate
.. //depot/projects/wifi/lib/libc/sys/ptrace.2#4 integrate
.. //depot/projects/wifi/lib/libc/uuid/uuid_compare.c#4 integrate
.. //depot/projects/wifi/lib/libthr/thread/thr_info.c#6 integrate
.. //depot/projects/wifi/libexec/rtld-elf/i386/Symbol.map#2 integrate
.. //depot/projects/wifi/libexec/rtld-elf/rtld.c#13 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate
.. //depot/projects/wifi/sbin/dump/traverse.c#5 integrate
.. //depot/projects/wifi/sbin/gbde/test.sh#2 integrate
.. //depot/projects/wifi/sbin/ggate/ggatec/Makefile#3 integrate
.. //depot/projects/wifi/sbin/ggate/shared/ggate.c#4 integrate
.. //depot/projects/wifi/share/man/man4/mpt.4#7 integrate
.. //depot/projects/wifi/share/man/man4/nfe.4#3 integrate
.. //depot/projects/wifi/share/man/man4/pci.4#4 integrate
.. //depot/projects/wifi/share/man/man4/polling.4#10 integrate
.. //depot/projects/wifi/share/man/man5/rc.conf.5#28 integrate
.. //depot/projects/wifi/share/man/man5/src.conf.5#4 integrate
.. //depot/projects/wifi/share/man/man9/VFS_SET.9#4 integrate
.. //depot/projects/wifi/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/wifi/share/misc/committers-src.dot#2 integrate
.. //depot/projects/wifi/share/mk/bsd.libnames.mk#11 integrate
.. //depot/projects/wifi/share/mk/bsd.own.mk#7 integrate
.. //depot/projects/wifi/sys/boot/forth/loader.conf#15 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot0.5/Makefile#3 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot0.5/boot0.5.s#3 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot0.5/ldscript#1 branch
.. //depot/projects/wifi/sys/boot/pc98/boot0.5/putssjis.s#1 branch
.. //depot/projects/wifi/sys/boot/pc98/boot0.5/selector.s#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot0.5/start.s#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot2/boot.c#6 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_sg.c#1 branch
.. //depot/projects/wifi/sys/cam/scsi/scsi_sg.h#1 branch
.. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#14 integrate
.. //depot/projects/wifi/sys/compat/linux/linux_ioctl.c#11 integrate
.. //depot/projects/wifi/sys/compat/linux/linux_ioctl.h#5 integrate
.. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#20 integrate
.. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#14 integrate
.. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#20 integrate
.. //depot/projects/wifi/sys/compat/ndis/subr_pe.c#6 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/wifi/sys/conf/NOTES#35 integrate
.. //depot/projects/wifi/sys/conf/files#43 integrate
.. //depot/projects/wifi/sys/conf/files.amd64#22 integrate
.. //depot/projects/wifi/sys/conf/files.i386#26 integrate
.. //depot/projects/wifi/sys/conf/files.ia64#10 integrate
.. //depot/projects/wifi/sys/conf/files.pc98#17 integrate
.. //depot/projects/wifi/sys/conf/files.powerpc#9 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/list.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch
.. //depot/projects/wifi/sys/dev/ata/ata-all.h#17 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#26 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-dma.c#13 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#20 integrate
.. //depot/projects/wifi/sys/dev/ata/ata_if.m#5 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/sys/mvec.h#1 branch
.. //depot/projects/wifi/sys/dev/cxgb/sys/uipc_mvec.c#1 branch
.. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_pccard.c#7 integrate
.. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#10 integrate
.. //depot/projects/wifi/sys/dev/msk/if_msk.c#4 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#11 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_bus_pci.c#5 integrate
.. //depot/projects/wifi/sys/fs/pseudofs/pseudofs.c#6 integrate
.. //depot/projects/wifi/sys/fs/pseudofs/pseudofs.h#5 integrate
.. //depot/projects/wifi/sys/geom/eli/g_eli.c#9 integrate
.. //depot/projects/wifi/sys/geom/journal/g_journal.c#3 integrate
.. //depot/projects/wifi/sys/geom/uzip/g_uzip.c#6 integrate
.. //depot/projects/wifi/sys/i386/i386/identcpu.c#13 integrate
.. //depot/projects/wifi/sys/i386/i386/initcpu.c#6 integrate
.. //depot/projects/wifi/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/pmap.c#20 integrate
.. //depot/projects/wifi/sys/i386/i386/trap.c#13 integrate
.. //depot/projects/wifi/sys/i386/include/pmap.h#8 integrate
.. //depot/projects/wifi/sys/i386/include/specialreg.h#6 integrate
.. //depot/projects/wifi/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/wifi/sys/kern/kern_jail.c#11 integrate
.. //depot/projects/wifi/sys/kern/kern_mbuf.c#13 integrate
.. //depot/projects/wifi/sys/kern/subr_witness.c#25 integrate
.. //depot/projects/wifi/sys/kern/uipc_syscalls.c#21 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#29 integrate
.. //depot/projects/wifi/sys/kern/vfs_syscalls.c#21 integrate
.. //depot/projects/wifi/sys/libkern/memset.c#1 branch
.. //depot/projects/wifi/sys/modules/Makefile#36 integrate
.. //depot/projects/wifi/sys/modules/cam/Makefile#4 integrate
.. //depot/projects/wifi/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/zfs/Makefile#1 branch
.. //depot/projects/wifi/sys/netinet/libalias/alias_db.c#5 integrate
.. //depot/projects/wifi/sys/netinet/libalias/alias_skinny.c#5 integrate
.. //depot/projects/wifi/sys/sun4v/include/smp.h#3 integrate
.. //depot/projects/wifi/sys/sys/filio.h#3 integrate
.. //depot/projects/wifi/sys/sys/jail.h#8 integrate
.. //depot/projects/wifi/sys/sys/kernel.h#11 integrate
.. //depot/projects/wifi/sys/sys/mount.h#19 integrate
.. //depot/projects/wifi/sys/sys/param.h#25 integrate
.. //depot/projects/wifi/sys/sys/priv.h#3 integrate
.. //depot/projects/wifi/sys/sys/systm.h#21 integrate
.. //depot/projects/wifi/sys/sys/unistd.h#5 integrate
.. //depot/projects/wifi/sys/vm/vm_fault.c#15 integrate
.. //depot/projects/wifi/sys/vm/vm_kern.c#7 integrate
.. //depot/projects/wifi/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate
.. //depot/projects/wifi/tools/build/options/WITHOUT_ZFS#1 branch
.. //depot/projects/wifi/tools/regression/netinet/ipblock/Makefile#1 branch
.. //depot/projects/wifi/tools/regression/netinet/ipblock/ipblock.c#1 branch
.. //depot/projects/wifi/usr.bin/lsvfs/lsvfs.c#2 integrate
.. //depot/projects/wifi/usr.bin/sed/POSIX#2 integrate
.. //depot/projects/wifi/usr.bin/tar/read.c#8 integrate
.. //depot/projects/wifi/usr.sbin/jail/jail.8#16 integrate
.. //depot/projects/wifi/usr.sbin/sa/pdb.c#3 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/config.c#11 integrate

Differences ...

==== //depot/projects/wifi/MAINTAINERS#14 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.142 2006/11/11 22:24:10 kris Exp $
+$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -108,6 +108,7 @@
 geom_stripe	pjd	Pre-commit review preferred.
 geom_zero	pjd	Pre-commit review preferred.
 sbin/geom	pjd	Pre-commit review preferred.
+zfs		pjd	Pre-commit review preferred.
 nfs		alfred	Will be happy to review code, but not mandatory.
 rpc.lockd	alfred	Will be happy to review code, but not mandatory.
 truss		alfred	Will be happy to review code, but not mandatory.

==== //depot/projects/wifi/Makefile.inc1#32 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.570 2007/03/09 12:11:56 rafan Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -40,6 +40,9 @@
 .if ${MK_GAMES} != "no"
 SUBDIR+=games
 .endif
+.if ${MK_CDDL} != "no"
+SUBDIR+=cddl
+.endif
 SUBDIR+=gnu include
 .if ${MK_KERBEROS} != "no"
 SUBDIR+=kerberos5
@@ -430,6 +433,9 @@
 .for _t in obj includes
 	cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t}
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
+.if ${MK_CDDL} != "no"
+	cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t}
+.endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t}
@@ -1014,12 +1020,16 @@
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
-		${_secure_lib_libssl}
+		${_secure_lib_libssl} lib/libthr
 
-_generic_libs=	gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
+_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
+.if ${MK_CDDL} != "no"
+_cddl_lib= cddl/lib
+.endif
+
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"
 _secure_lib_libcrypto= secure/lib/libcrypto

==== //depot/projects/wifi/bin/df/df.c#5 (text+ko) ====

@@ -44,7 +44,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.67 2007/03/08 06:10:17 will Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -384,7 +384,7 @@
 static void
 prtstat(struct statfs *sfsp, struct maxwidths *mwp)
 {
-	static u_long blocksize;
+	static long blocksize;
 	static int headerlen, timesthrough = 0;
 	static const char *header;
 	int64_t used, availblks, inodes;
@@ -461,7 +461,7 @@
 static void
 update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp)
 {
-	static u_long blocksize = 0;
+	static long blocksize = 0;
 	int dummy;
 
 	if (blocksize == 0)

==== //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.h#2 (text+ko) ====

@@ -39,7 +39,7 @@
  *      %W% (Berkeley) %G%
  *
  * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $
- * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.4 2004/07/06 13:16:46 mbr Exp $
+ * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.5 2007/04/06 15:51:35 kan Exp $
  *
  * HLFSD was written at Columbia University Computer Science Department, by
  * Erez Zadok <ezk at cs.columbia.edu> and Alexander Dupuy <dupuy at cs.columbia.edu>
@@ -143,7 +143,6 @@
 extern char *mailbox(int, char *);
 extern char *passwdfile;
 extern char *slinkname;
-extern char mboxfile[];
 extern gid_t hlfs_gid;
 extern int cache_interval;
 extern int noverify;

==== //depot/projects/wifi/contrib/binutils/gas/as.h#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /* as.h - global header file
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003
+   1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -397,6 +397,22 @@
 /* Enough bits for address, but still an integer type.
    Could be a problem, cross-assembling for 64-bit machines.  */
 typedef addressT relax_addressT;
+
+struct relax_type
+{
+  /* Forward reach. Signed number. > 0.  */
+  offsetT rlx_forward;
+  /* Backward reach. Signed number. < 0.  */
+  offsetT rlx_backward;
+
+  /* Bytes length of this address.  */
+  unsigned char rlx_length;
+
+  /* Next longer relax-state.  0 means there is no 'next' relax-state.  */
+  relax_substateT rlx_more;
+};
+
+typedef struct relax_type relax_typeS;
 
 /* main program "as.c" (command arguments etc) */
 

==== //depot/projects/wifi/contrib/binutils/gas/tc.h#2 (text+ko) ====

@@ -24,25 +24,6 @@
 
 extern const pseudo_typeS md_pseudo_table[];
 
-/* JF moved this here from as.h under the theory that nobody except MACHINE.c
-   and write.c care about it anyway.  */
-
-struct relax_type
-{
-  /* Forward reach. Signed number. > 0.  */
-  long rlx_forward;
-  /* Backward reach. Signed number. < 0.  */
-  long rlx_backward;
-
-  /* Bytes length of this address.  */
-  unsigned char rlx_length;
-
-  /* Next longer relax-state.  0 means there is no 'next' relax-state.  */
-  relax_substateT rlx_more;
-};
-
-typedef struct relax_type relax_typeS;
-
 extern const int md_reloc_size;	/* Size of a relocation record */
 
 char *md_atof (int what_statement_type, char *literalP, int *sizeP);

==== //depot/projects/wifi/contrib/openpam/lib/openpam_readline.c#3 (text) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $
+ * $Id: openpam_readline.c 380 2006-03-14 14:42:09Z des $
  */
 
 #include <ctype.h>
@@ -52,7 +52,7 @@
 char *
 openpam_readline(FILE *f, int *lineno, size_t *lenp)
 {
-	unsigned char *line;
+	char *line;
 	size_t len, size;
 	int ch;
 
@@ -63,7 +63,7 @@
 
 #define line_putch(ch) do { \
 	if (len >= size - 1) { \
-		unsigned char *tmp = realloc(line, size *= 2); \
+		char *tmp = realloc(line, size *= 2); \
 		if (tmp == NULL) \
 			goto fail; \
 		line = tmp; \
@@ -83,7 +83,7 @@
 		/* eof */
 		if (ch == EOF) {
 			/* remove trailing whitespace */
-			while (len > 0 && isspace(line[len - 1]))
+			while (len > 0 && isspace((int)line[len - 1]))
 				--len;
 			line[len] = '\0';
 			if (len == 0)
@@ -96,7 +96,7 @@
 				++*lineno;
 
 			/* remove trailing whitespace */
-			while (len > 0 && isspace(line[len - 1]))
+			while (len > 0 && isspace((int)line[len - 1]))
 				--len;
 			line[len] = '\0';
 			/* skip blank lines */

==== //depot/projects/wifi/contrib/tcpdump/print-stp.c#3 (text+ko) ====

@@ -11,7 +11,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.1 2005/04/26 07:27:17 guy Exp $";
+"@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.7 2007/03/18 17:12:36 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -28,75 +28,338 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static void
+#define	RSTP_EXTRACT_PORT_ROLE(x) (((x)&0x0C)>>2) 
+/* STP timers are expressed in multiples of 1/256th second */
+#define STP_TIME_BASE 256
+#define STP_BPDU_MSTP_MIN_LEN 102
+
+struct stp_bpdu_ {
+    u_int8_t protocol_id[2];
+    u_int8_t protocol_version;
+    u_int8_t bpdu_type;
+    u_int8_t flags;
+    u_int8_t root_id[8];
+    u_int8_t root_path_cost[4];
+    u_int8_t bridge_id[8];
+    u_int8_t port_id[2];
+    u_int8_t message_age[2];
+    u_int8_t max_age[2];
+    u_int8_t hello_time[2];
+    u_int8_t forward_delay[2];
+    u_int8_t v1_length;
+};
+
+#define STP_PROTO_REGULAR 0x00
+#define STP_PROTO_RAPID   0x02
+#define STP_PROTO_MSTP    0x03
+
+struct tok stp_proto_values[] = {
+    { STP_PROTO_REGULAR, "802.1d" },
+    { STP_PROTO_RAPID, "802.1w" },
+    { STP_PROTO_MSTP, "802.1s" },
+    { 0, NULL}
+};
+
+#define STP_BPDU_TYPE_CONFIG      0x00
+#define STP_BPDU_TYPE_RSTP        0x02
+#define STP_BPDU_TYPE_TOPO_CHANGE 0x80
+
+struct tok stp_bpdu_flag_values[] = {
+    { 0x01, "Topology change" },
+    { 0x02, "Proposal" },
+    { 0x10, "Learn" },
+    { 0x20, "Forward" },
+    { 0x40, "Agreement" },
+    { 0x80, "Topology change ACK" },
+    { 0, NULL}
+};
+
+struct tok stp_bpdu_type_values[] = {
+    { STP_BPDU_TYPE_CONFIG, "Config" },
+    { STP_BPDU_TYPE_RSTP, "Rapid STP" },
+    { STP_BPDU_TYPE_TOPO_CHANGE, "Topology Change" },
+    { 0, NULL}
+};
+
+struct tok rstp_obj_port_role_values[] = {
+    { 0x00, "Unknown" },
+    { 0x01, "Alternate" },
+    { 0x02, "Root" },
+    { 0x03, "Designated" },
+    { 0, NULL}
+};
+
+static char *
 stp_print_bridge_id(const u_char *p)
 {
-	printf("%.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
-	       p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+    static char bridge_id_str[sizeof("pppp.aa:bb:cc:dd:ee:ff")];
+
+    snprintf(bridge_id_str, sizeof(bridge_id_str),
+             "%.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
+             p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+
+    return bridge_id_str;
 }
 
 static void
-stp_print_config_bpdu(const u_char *p)
+stp_print_config_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length)
 {
-	printf("config ");
-	if (p[4] & 1)
-		printf("TOP_CHANGE ");
-	if (p[4] & 0x80)
-		printf("TOP_CHANGE_ACK ");
+    printf(", Flags [%s]",
+           bittok2str(stp_bpdu_flag_values, "none", stp_bpdu->flags));
+
+    printf(", bridge-id %s.%04x, length %u",
+           stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id),
+           EXTRACT_16BITS(&stp_bpdu->port_id), length);
 
-	stp_print_bridge_id(p+17);
-	printf(".%.2x%.2x ", p[25], p[26]);
+    /* in non-verbose mode just print the bridge-id */
+    if (!vflag) {
+        return;
+    }
 
-	printf("root ");
-	stp_print_bridge_id(p+5);
+    printf("\n\tmessage-age %.2fs, max-age %.2fs"
+           ", hello-time %.2fs, forwarding-delay %.2fs",
+           (float)EXTRACT_16BITS(&stp_bpdu->message_age) / STP_TIME_BASE,
+           (float)EXTRACT_16BITS(&stp_bpdu->max_age) / STP_TIME_BASE,
+           (float)EXTRACT_16BITS(&stp_bpdu->hello_time) / STP_TIME_BASE,
+           (float)EXTRACT_16BITS(&stp_bpdu->forward_delay) / STP_TIME_BASE);
 
-	printf(" pathcost %i ", (p[13] << 24) | (p[14] << 16) | (p[15] << 8) | p[16]);
+    printf("\n\troot-id %s, root-pathcost %u",
+           stp_print_bridge_id((const u_char *)&stp_bpdu->root_id),
+           EXTRACT_32BITS(&stp_bpdu->root_path_cost));
 
-	printf("age %i ", p[27]);
-	printf("max %i ", p[29]);
-	printf("hello %i ", p[31]);
-	printf("fdelay %i ", p[33]);
+    /* Port role is only valid for 802.1w */
+    if (stp_bpdu->protocol_version == STP_PROTO_RAPID) {
+        printf(", port-role %s",
+               tok2str(rstp_obj_port_role_values, "Unknown",
+                       RSTP_EXTRACT_PORT_ROLE(stp_bpdu->flags)));
+    }
 }
 
+/*
+ * MSTP packet format
+ * Ref. IEEE 802.1Q 2003 Ed. Section 14
+ *
+ * MSTP BPDU
+ *
+ * 2 -  bytes Protocol Id
+ * 1 -  byte  Protocol Ver. 
+ * 1 -  byte  BPDU tye
+ * 1 -  byte  Flags
+ * 8 -  bytes CIST Root Identifier
+ * 4 -  bytes CIST External Path Cost
+ * 8 -  bytes CIST Regional Root Identifier
+ * 2 -  bytes CIST Port Identifier
+ * 2 -  bytes Message Age
+ * 2 -  bytes Max age
+ * 2 -  bytes Hello Time
+ * 2 -  bytes Forward delay
+ * 1 -  byte  Version 1 length. Must be 0
+ * 2 -  bytes Version 3 length
+ * 1 -  byte  Config Identifier
+ * 32 - bytes Config Name
+ * 2 -  bytes Revision level
+ * 16 - bytes Config Digest [MD5]
+ * 4 -  bytes CIST Internal Root Path Cost
+ * 8 -  bytes CIST Bridge Identifier
+ * 1 -  byte  CIST Remaining Hops
+ * 16 - bytes MSTI information [Max 64 MSTI, each 16 bytes]
+ *
+ * MSTI Payload
+ *
+ * 1 - byte  MSTI flag
+ * 8 - bytes MSTI Regional Root Identifier
+ * 4 - bytes MSTI Regional Path Cost
+ * 1 - byte  MSTI Bridge Priority
+ * 1 - byte  MSTI Port Priority
+ * 1 - byte  MSTI Remaining Hops
+ */
+
+#define MST_BPDU_MSTI_LENGTH		    16
+#define MST_BPDU_CONFIG_INFO_LENGTH	    64
+
+/* Offsets of fields from the begginning for the packet */
+#define MST_BPDU_VER3_LEN_OFFSET	    36
+#define MST_BPDU_CONFIG_NAME_OFFSET	    39
+#define MST_BPDU_CONFIG_DIGEST_OFFSET	    73
+#define MST_BPDU_CIST_INT_PATH_COST_OFFSET  89
+#define MST_BPDU_CIST_BRIDGE_ID_OFFSET	    93
+#define MST_BPDU_CIST_REMAIN_HOPS_OFFSET    101
+#define MST_BPDU_MSTI_OFFSET		    102
+/* Offsets within  an MSTI */
+#define MST_BPDU_MSTI_ROOT_PRIO_OFFSET	    1
+#define MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET 9
+#define MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET    13
+#define MST_BPDU_MSTI_PORT_PRIO_OFFSET	    14
+#define MST_BPDU_MSTI_REMAIN_HOPS_OFFSET    15
+
 static void
-stp_print_tcn_bpdu(void)
+stp_print_mstp_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length)
 {
-	printf("tcn");
+    const u_char    *ptr;
+    u_int16_t	    v3len;
+    u_int16_t	    len;
+    u_int16_t	    msti;
+    u_int16_t	    offset;
+
+    ptr = (const u_char *)stp_bpdu;
+    printf(", CIST Flags [%s]",
+           bittok2str(stp_bpdu_flag_values, "none", stp_bpdu->flags));
+
+    /*
+     * in non-verbose mode just print the flags. We dont read that much
+     * of the packet (DEFAULT_SNAPLEN) to print out cist bridge-id
+     */
+    if (!vflag) {
+        return;
+    }
+
+    printf(", CIST bridge-id %s.%04x, length %u",
+           stp_print_bridge_id(ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET),
+           EXTRACT_16BITS(&stp_bpdu->port_id), length);
+
+
+    printf("\n\tmessage-age %.2fs, max-age %.2fs"
+           ", hello-time %.2fs, forwarding-delay %.2fs",
+           (float)EXTRACT_16BITS(&stp_bpdu->message_age) / STP_TIME_BASE,
+           (float)EXTRACT_16BITS(&stp_bpdu->max_age) / STP_TIME_BASE,
+           (float)EXTRACT_16BITS(&stp_bpdu->hello_time) / STP_TIME_BASE,
+           (float)EXTRACT_16BITS(&stp_bpdu->forward_delay) / STP_TIME_BASE);
+
+    printf("\n\tCIST root-id %s, ext-pathcost %u int-pathcost %u",
+           stp_print_bridge_id((const u_char *)&stp_bpdu->root_id),
+           EXTRACT_32BITS(&stp_bpdu->root_path_cost),
+           EXTRACT_32BITS(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET));
+
+    printf(", port-role %s",
+           tok2str(rstp_obj_port_role_values, "Unknown",
+                   RSTP_EXTRACT_PORT_ROLE(stp_bpdu->flags)));
+
+    printf("\n\tCIST regional-root-id %s",
+           stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id));
+
+    printf("\n\tMSTP Configuration Name %s, revision %u, digest %08x%08x%08x%08x",
+           ptr + MST_BPDU_CONFIG_NAME_OFFSET,
+	   EXTRACT_16BITS(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32),
+	   EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET),
+	   EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 4),
+	   EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 8),
+	   EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12));
+
+    printf("\n\tCIST remaining-hops %d", ptr[MST_BPDU_CIST_REMAIN_HOPS_OFFSET]);
+
+    /* Dump all MSTI's */
+    v3len = EXTRACT_16BITS(ptr + MST_BPDU_VER3_LEN_OFFSET);
+    if (v3len > MST_BPDU_CONFIG_INFO_LENGTH) {
+        len = v3len - MST_BPDU_CONFIG_INFO_LENGTH;
+        offset = MST_BPDU_MSTI_OFFSET;
+        while (len >= MST_BPDU_MSTI_LENGTH) {
+            msti = EXTRACT_16BITS(ptr + offset +
+                                  MST_BPDU_MSTI_ROOT_PRIO_OFFSET);
+            msti = msti & 0x0FFF;
+
+            printf("\n\tMSTI %d, Flags [%s], port-role %s", 
+                   msti, bittok2str(stp_bpdu_flag_values, "none", ptr[offset]),
+                   tok2str(rstp_obj_port_role_values, "Unknown",
+                           RSTP_EXTRACT_PORT_ROLE(ptr[offset])));
+            printf("\n\t\tMSTI regional-root-id %s, pathcost %u",
+                   stp_print_bridge_id(ptr + offset +
+                                       MST_BPDU_MSTI_ROOT_PRIO_OFFSET),
+                   EXTRACT_32BITS(ptr + offset +
+                                  MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET));
+            printf("\n\t\tMSTI bridge-prio %d, port-prio %d, hops %d",
+                   ptr[offset + MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET] >> 4,
+                   ptr[offset + MST_BPDU_MSTI_PORT_PRIO_OFFSET] >> 4,
+                   ptr[offset + MST_BPDU_MSTI_REMAIN_HOPS_OFFSET]);
+
+            len -= MST_BPDU_MSTI_LENGTH;
+            offset += MST_BPDU_MSTI_LENGTH;
+        }
+    }
 }
 
 /*
- * Print 802.1d packets.
+ * Print 802.1d / 802.1w / 802.1q (mstp) packets.
  */
 void
 stp_print(const u_char *p, u_int length)
 {
-	if (length < 4)
-		goto trunc;
+    const struct stp_bpdu_ *stp_bpdu;
+    u_int16_t              mstp_len;
+    
+    stp_bpdu = (struct stp_bpdu_*)p;

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list