Date: Sun, 13 May 2007 12:09:42 GMT From: Sepherosa Ziehau <sephe@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 119766 for review Message-ID: <200705131209.l4DC9ggB036679@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=119766 Change 119766 by sephe@sephe_zealot:sam_wifi on 2007/05/13 12:09:15 - IFC 119758 - Make rum(4) work. Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#15 integrate .. //depot/projects/wifi/bin/mv/mv.1#4 integrate .. //depot/projects/wifi/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/wifi/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/wifi/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/wifi/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/wifi/lib/libc/gdtoa/_hdtoa.c#4 integrate .. //depot/projects/wifi/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/wifi/lib/libfetch/http.c#5 integrate .. //depot/projects/wifi/lib/libgeom/Makefile#2 integrate .. //depot/projects/wifi/lib/libgeom/geom_util.c#1 branch .. //depot/projects/wifi/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/wifi/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/wifi/lib/libipsec/pfkey_dump.c#2 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_init.c#10 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_mutex.c#8 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/wifi/lib/libutil/Makefile#5 integrate .. //depot/projects/wifi/lib/libutil/flopen.3#1 branch .. //depot/projects/wifi/lib/libutil/flopen.c#1 branch .. //depot/projects/wifi/lib/libutil/libutil.h#4 integrate .. //depot/projects/wifi/lib/libutil/pidfile.c#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.1#7 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#14 integrate .. //depot/projects/wifi/release/Makefile#19 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#23 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#22 integrate .. //depot/projects/wifi/sbin/dumpfs/dumpfs.8#3 integrate .. //depot/projects/wifi/sbin/fdisk/fdisk.c#9 integrate .. //depot/projects/wifi/sbin/fdisk_pc98/fdisk.8#5 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#10 integrate .. //depot/projects/wifi/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#19 integrate .. //depot/projects/wifi/sbin/setkey/setkey.8#5 integrate .. //depot/projects/wifi/sbin/setkey/token.l#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile#10 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile.inc#6 integrate .. //depot/projects/wifi/secure/lib/libcrypto/opensslconf-amd64.h#4 integrate .. //depot/projects/wifi/secure/lib/libcrypto/opensslconf-i386.h#4 integrate .. //depot/projects/wifi/share/man/man4/Makefile#35 integrate .. //depot/projects/wifi/share/man/man4/altq.4#16 integrate .. //depot/projects/wifi/share/man/man4/axe.4#6 integrate .. //depot/projects/wifi/share/man/man4/hptiop.4#1 branch .. //depot/projects/wifi/share/man/man4/md.4#3 integrate .. //depot/projects/wifi/share/man/man4/rum.4#1 branch .. //depot/projects/wifi/share/man/man4/snd_atiixp.4#3 integrate .. //depot/projects/wifi/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/wifi/share/man/man4/snd_via8233.4#6 integrate .. //depot/projects/wifi/share/man/man4/twa.4#5 integrate .. //depot/projects/wifi/share/man/man4/ubsa.4#4 integrate .. //depot/projects/wifi/share/man/man4/vlan.4#13 integrate .. //depot/projects/wifi/share/man/man5/passwd.5#5 integrate .. //depot/projects/wifi/share/man/man9/VFS_SYNC.9#5 integrate .. //depot/projects/wifi/share/man/man9/VOP_FSYNC.9#4 integrate .. //depot/projects/wifi/share/man/man9/disk.9#4 integrate .. //depot/projects/wifi/share/man/man9/g_bio.9#3 integrate .. //depot/projects/wifi/share/man/man9/make_dev.9#7 integrate .. //depot/projects/wifi/share/mklocale/ja_JP.eucJP.src#3 integrate .. //depot/projects/wifi/sys/amd64/acpica/madt.c#10 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/wifi/sys/amd64/amd64/io_apic.c#11 integrate .. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#19 integrate .. //depot/projects/wifi/sys/amd64/amd64/mptable.c#8 integrate .. //depot/projects/wifi/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/nexus.c#12 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#21 integrate .. //depot/projects/wifi/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/wifi/sys/amd64/include/intr_machdep.h#11 integrate .. //depot/projects/wifi/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/wifi/sys/amd64/isa/atpic.c#8 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/wifi/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/wifi/sys/boot/common/loader.8#11 integrate .. //depot/projects/wifi/sys/conf/Makefile.amd64#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#12 integrate .. //depot/projects/wifi/sys/conf/Makefile.i386#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.ia64#7 integrate .. //depot/projects/wifi/sys/conf/Makefile.pc98#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.powerpc#9 integrate .. //depot/projects/wifi/sys/conf/Makefile.sparc64#7 integrate .. //depot/projects/wifi/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/wifi/sys/conf/NOTES#37 integrate .. //depot/projects/wifi/sys/conf/files#47 integrate .. //depot/projects/wifi/sys/conf/options#31 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/wifi/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/wifi/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/wifi/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/wifi/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#18 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#22 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/wifi/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/wifi/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/wifi/sys/dev/isp/isp.c#11 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/wifi/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/wifi/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/wifi/sys/dev/isp/isp_tpublic.h#8 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.h#12 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#12 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/wifi/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/wifi/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/wifi/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#13 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#28 integrate .. //depot/projects/wifi/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.h#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_externs.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_fwif.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_fwimg.c#3 delete .. //depot/projects/wifi/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_ioctl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_includes.h#5 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_ioctl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_share.h#6 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_cuereg.h#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_kuereg.h#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_ruereg.h#4 integrate .. //depot/projects/wifi/sys/dev/usb/if_rum.c#1 add .. //depot/projects/wifi/sys/dev/usb/if_rumreg.h#1 add .. //depot/projects/wifi/sys/dev/usb/if_rumvar.h#1 add .. //depot/projects/wifi/sys/dev/usb/if_udav.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#24 edit .. //depot/projects/wifi/sys/dev/usb/if_uralvar.h#9 integrate .. //depot/projects/wifi/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/usb.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/usb_mem.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli_ctl.c#7 integrate .. //depot/projects/wifi/sys/geom/geom.h#9 integrate .. //depot/projects/wifi/sys/geom/geom_dev.c#9 integrate .. //depot/projects/wifi/sys/geom/geom_disk.c#11 integrate .. //depot/projects/wifi/sys/geom/geom_disk.h#5 integrate .. //depot/projects/wifi/sys/geom/geom_io.c#9 integrate .. //depot/projects/wifi/sys/geom/geom_slice.c#6 integrate .. //depot/projects/wifi/sys/geom/geom_subr.c#7 integrate .. //depot/projects/wifi/sys/geom/part/g_part.c#3 integrate .. //depot/projects/wifi/sys/geom/part/g_part.h#2 integrate .. //depot/projects/wifi/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/wifi/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/wifi/sys/i386/acpica/madt.c#10 integrate .. //depot/projects/wifi/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#26 integrate .. //depot/projects/wifi/sys/i386/conf/PAE#10 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/wifi/sys/i386/i386/io_apic.c#12 integrate .. //depot/projects/wifi/sys/i386/i386/local_apic.c#18 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#23 integrate .. //depot/projects/wifi/sys/i386/i386/mptable.c#10 integrate .. //depot/projects/wifi/sys/i386/i386/msi.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/nexus.c#11 integrate .. //depot/projects/wifi/sys/i386/include/apicvar.h#13 integrate .. //depot/projects/wifi/sys/i386/include/intr_machdep.h#12 integrate .. //depot/projects/wifi/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/wifi/sys/i386/isa/atpic.c#8 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/wifi/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/wifi/sys/kern/kern_condvar.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_sx.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_synch.c#14 integrate .. //depot/projects/wifi/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/wifi/sys/modules/Makefile#38 integrate .. //depot/projects/wifi/sys/modules/crypto/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/em/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/wifi/sys/modules/twa/Makefile#6 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/wifi/sys/net/if_lagg.c#3 integrate .. //depot/projects/wifi/sys/net/if_lagg.h#3 integrate .. //depot/projects/wifi/sys/net/pfkeyv2.h#3 integrate .. //depot/projects/wifi/sys/netatalk/ddp_usrreq.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_socket.c#13 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#18 integrate .. //depot/projects/wifi/sys/netinet/in.c#15 integrate .. //depot/projects/wifi/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/wifi/sys/netinet/in_gif.c#10 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/wifi/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/wifi/sys/netinet/ip.h#4 integrate .. //depot/projects/wifi/sys/netinet/ip_divert.c#14 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.c#13 integrate .. //depot/projects/wifi/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#26 integrate .. //depot/projects/wifi/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/wifi/sys/netinet/ip_id.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#17 integrate .. //depot/projects/wifi/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/wifi/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/wifi/sys/netinet/ip_options.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_options.h#2 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#18 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_os.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctputil.h#7 integrate .. //depot/projects/wifi/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/wifi/sys/netinet/tcp_fsm.h#4 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#24 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/wifi/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/wifi/sys/netinet/tcp_sack.c#18 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#28 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/wifi/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#25 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#19 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/wifi/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/wifi/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/wifi/sys/netinet6/esp_core.c#5 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#10 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#12 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/wifi/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx.h#5 integrate .. //depot/projects/wifi/sys/netipx/ipx_cksum.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/wifi/sys/netipx/ipx_input.c#9 integrate .. //depot/projects/wifi/sys/netipx/ipx_outputfl.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx_pcb.c#8 integrate .. //depot/projects/wifi/sys/netipx/ipx_pcb.h#6 integrate .. //depot/projects/wifi/sys/netipx/ipx_usrreq.c#8 integrate .. //depot/projects/wifi/sys/netipx/ipx_var.h#5 integrate .. //depot/projects/wifi/sys/netipx/spx_debug.c#4 integrate .. //depot/projects/wifi/sys/netipx/spx_debug.h#4 integrate .. //depot/projects/wifi/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/wifi/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/wifi/sys/opencrypto/cryptosoft.c#6 integrate .. //depot/projects/wifi/sys/opencrypto/xform.c#6 integrate .. //depot/projects/wifi/sys/opencrypto/xform.h#4 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/wifi/sys/pci/if_tl.c#13 integrate .. //depot/projects/wifi/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/wifi/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/wifi/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/wifi/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/wifi/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/wifi/sys/sys/callout.h#4 integrate .. //depot/projects/wifi/sys/sys/disk.h#4 integrate .. //depot/projects/wifi/sys/sys/interrupt.h#8 integrate .. //depot/projects/wifi/sys/sys/param.h#27 integrate .. //depot/projects/wifi/sys/sys/rwlock.h#6 integrate .. //depot/projects/wifi/sys/sys/sx.h#7 integrate .. //depot/projects/wifi/sys/vm/uma_int.h#10 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#17 integrate .. //depot/projects/wifi/sys/vm/vm_page.h#9 integrate .. //depot/projects/wifi/tools/regression/sockets/sblock/Makefile#1 branch .. //depot/projects/wifi/tools/regression/sockets/sblock/sblock.c#1 branch .. //depot/projects/wifi/usr.bin/calendar/calendar.c#2 integrate .. //depot/projects/wifi/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/wifi/usr.bin/calendar/day.c#4 integrate .. //depot/projects/wifi/usr.bin/calendar/io.c#2 integrate .. //depot/projects/wifi/usr.bin/calendar/ostern.c#2 integrate .. //depot/projects/wifi/usr.bin/calendar/paskha.c#2 integrate .. //depot/projects/wifi/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/wifi/usr.bin/logger/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/logger/logger.c#4 integrate .. //depot/projects/wifi/usr.bin/login/login.h#4 integrate .. //depot/projects/wifi/usr.bin/login/login_audit.c#2 integrate .. //depot/projects/wifi/usr.bin/login/login_fbtab.c#2 integrate .. //depot/projects/wifi/usr.bin/quota/quota.c#7 integrate .. //depot/projects/wifi/usr.bin/tar/read.c#10 integrate .. //depot/projects/wifi/usr.bin/time/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/time/time.c#4 integrate .. //depot/projects/wifi/usr.bin/tip/tip/acu.c#3 integrate .. //depot/projects/wifi/usr.sbin/boot0cfg/boot0cfg.8#4 integrate .. //depot/projects/wifi/usr.sbin/config/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/config/config.8#6 integrate .. //depot/projects/wifi/usr.sbin/config/config.h#6 integrate .. //depot/projects/wifi/usr.sbin/config/config.y#8 integrate .. //depot/projects/wifi/usr.sbin/config/configvers.h#8 integrate .. //depot/projects/wifi/usr.sbin/config/kernconf.tmpl#1 branch .. //depot/projects/wifi/usr.sbin/config/lang.l#6 integrate .. //depot/projects/wifi/usr.sbin/config/main.c#12 integrate .. //depot/projects/wifi/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/wifi/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/wifi/usr.sbin/mixer/mixer.8#4 integrate .. //depot/projects/wifi/usr.sbin/nologin/nologin.5#2 integrate .. //depot/projects/wifi/usr.sbin/pccard/pccardc/pccardc.8#2 integrate Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.82 2007/05/10 13:25:27 roberto Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070510: zpool/zfs moved to /sbin +OLD_FILES+=usr/sbin/zfs +OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth # 20070421: worm.4 removed ==== //depot/projects/wifi/bin/mv/mv.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.28 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ .\" .Dd July 9, 2002 .Dt MV 1 @@ -113,9 +113,9 @@ to be verbose, showing files after they are moved. .El .Pp -It is an error for either the +It is an error for the .Ar source -operand or the destination path to specify a directory unless both do. +operand to specify a directory if the target exists and is not a directory. .Pp If the destination path does not have a mode which permits writing, .Nm ==== //depot/projects/wifi/cddl/lib/libzfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $ .PATH: ${.CURDIR}/../../../compat/opensolaris/misc .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs @@ -9,7 +9,8 @@ DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c \ +SRCS= deviceid.c \ + mnttab.c \ mkdirp.c \ zmount.c \ fsshare.c \ ==== //depot/projects/wifi/compat/opensolaris/include/devid.h#2 (text+ko) ==== @@ -27,23 +27,28 @@ #ifndef _OPENSOLARIS_DEVID_H_ #define _OPENSOLARIS_DEVID_H_ -#include <sys/types.h> +#include <sys/param.h> +#include <sys/disk.h> #include <stdlib.h> -typedef int ddi_devid_t; +typedef struct ddi_devid { + char devid[DISK_IDENT_SIZE]; +} ddi_devid_t; typedef struct devid_nmlist { - char *devname; + char devname[MAXPATHLEN]; dev_t dev; } devid_nmlist_t; -static inline int devid_str_decode(char *devidstr, ddi_devid_t *retdevid, char **retminor_name) { abort(); } -static inline int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid, char *minor_name, devid_nmlist_t **retlist) { abort(); } -static inline void devid_str_free(char *str) { abort(); } -static inline void devid_free(ddi_devid_t devid) { abort(); } -static inline void devid_free_nmlist(devid_nmlist_t *list) { abort(); } -static inline int devid_get(int fd, ddi_devid_t *retdevid) { return -1; } -static inline int devid_get_minor_name(int fd, char **retminor_name) { abort(); } -static inline char *devid_str_encode(ddi_devid_t devid, char *minor_name) { abort(); } +int devid_str_decode(char *devidstr, ddi_devid_t *retdevid, + char **retminor_name); +int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid, + char *minor_name, devid_nmlist_t **retlist); +void devid_str_free(char *str); +void devid_free(ddi_devid_t devid); +void devid_free_nmlist(devid_nmlist_t *list); +int devid_get(int fd, ddi_devid_t *retdevid); +int devid_get_minor_name(int fd, char **retminor_name); +char *devid_str_encode(ddi_devid_t devid, char *minor_name); #endif /* !_OPENSOLARIS_DEVID_H_ */ ==== //depot/projects/wifi/contrib/amd/amq/amq.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.13 2007/05/12 10:25:31 pav Exp $ .\" .Dd March 16, 1991 .Dt AMQ 8 @@ -133,7 +133,7 @@ Ask the automounter to use the logging options specified in .Ar log_options from now on. -.It Fl D Ar log_options +.It Fl D Ar debug_options Ask the automounter to use the debugging options specified in .Ar debug_options from now on. ==== //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 (text+ko) ==== @@ -159,18 +159,14 @@ static boolean_t is_provider(const char *name) { - off_t mediasize; int fd; - fd = open(name, O_RDONLY); - if (fd == -1) - return (B_FALSE); - if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) == -1) { - close(fd); - return (B_FALSE); + fd = g_open(name, 0); + if (fd >= 0) { + g_close(fd); + return (B_TRUE); } - close(fd); - return (B_TRUE); + return (B_FALSE); } /* @@ -183,9 +179,11 @@ nvlist_t * make_leaf_vdev(const char *arg) { - char path[MAXPATHLEN]; + char ident[DISK_IDENT_SIZE], path[MAXPATHLEN]; + struct stat64 statbuf; nvlist_t *vdev = NULL; char *type = NULL; + boolean_t wholedisk = B_FALSE; if (strncmp(arg, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) strlcpy(path, arg, sizeof (path)); @@ -212,6 +210,41 @@ verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK, (uint64_t)B_FALSE) == 0); + /* + * For a whole disk, defer getting its devid until after labeling it. + */ + if (1 || (S_ISBLK(statbuf.st_mode) && !wholedisk)) { + /* + * Get the devid for the device. + */ + int fd; + ddi_devid_t devid; + char *minor = NULL, *devid_str = NULL; + + if ((fd = open(path, O_RDONLY)) < 0) { + (void) fprintf(stderr, gettext("cannot open '%s': " + "%s\n"), path, strerror(errno)); + nvlist_free(vdev); + return (NULL); + } + + if (devid_get(fd, &devid) == 0) { + if (devid_get_minor_name(fd, &minor) == 0 && + (devid_str = devid_str_encode(devid, minor)) != + NULL) { + verify(nvlist_add_string(vdev, + ZPOOL_CONFIG_DEVID, devid_str) == 0); + } + if (devid_str != NULL) + devid_str_free(devid_str); + if (minor != NULL) + devid_str_free(minor); + devid_free(devid); + } + + (void) close(fd); + } + return (vdev); } ==== //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -446,10 +446,6 @@ extern int ddi_strtoul(const char *str, char **nptr, int base, unsigned long *result); -#ifdef __cplusplus -} -#endif - /* ZFS Boot Related stuff. */ struct _buf { @@ -508,4 +504,8 @@ #define ERESTART (-1) #endif +#ifdef __cplusplus +} +#endif + #endif /* _SYS_ZFS_CONTEXT_H */ ==== //depot/projects/wifi/lib/libc/gdtoa/_hdtoa.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); #include <float.h> #include <limits.h> @@ -78,7 +78,7 @@ break; case 1: /* to nearest, halfway rounds to even */ if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits - 1] & 1)) + (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) adjust = roundup(s0, ndigits); break; case 2: /* toward +inf */ ==== //depot/projects/wifi/lib/libc/sparc64/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sparc64/Symbol.map,v 1.3 2007/04/29 14:05:19 deischen Exp $ + * $FreeBSD: src/lib/libc/sparc64/Symbol.map,v 1.4 2007/05/11 23:43:55 marius Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; _longjmp; fabs; ==== //depot/projects/wifi/lib/libc/stdio/vfprintf.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.76 2007/01/09 00:28:07 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.77 2007/05/08 03:08:28 das Exp $"); /* * Actual printf innards. @@ -908,6 +908,7 @@ } else cp = (ch >= 'a') ? "inf" : "INF"; size = 3; + flags &= ~ZEROPAD; break; } flags |= FPT; ==== //depot/projects/wifi/lib/libfetch/http.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.77 2005/08/24 12:28:05 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.78 2007/05/08 19:28:03 des Exp $"); /* * The following copyright applies to the base64 code: @@ -92,6 +92,7 @@ #define HTTP_MOVED_PERM 301 #define HTTP_MOVED_TEMP 302 #define HTTP_SEE_OTHER 303 +#define HTTP_TEMP_REDIRECT 307 #define HTTP_NEED_AUTH 401 #define HTTP_NEED_PROXY_AUTH 407 #define HTTP_BAD_RANGE 416 @@ -99,6 +100,7 @@ #define HTTP_REDIRECT(xyz) ((xyz) == HTTP_MOVED_PERM \ || (xyz) == HTTP_MOVED_TEMP \ + || (xyz) == HTTP_TEMP_REDIRECT \ || (xyz) == HTTP_SEE_OTHER) #define HTTP_ERROR(xyz) ((xyz) > 400 && (xyz) < 599) ==== //depot/projects/wifi/lib/libgeom/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.10 2004/03/07 16:07:57 phk Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.11 2007/05/06 01:17:46 pjd Exp $ LIB= geom SHLIBDIR?= /lib @@ -6,6 +6,7 @@ SRCS+= geom_stats.c SRCS+= geom_xml2tree.c SRCS+= geom_ctl.c +SRCS+= geom_util.c INCS= libgeom.h CFLAGS += -I${.CURDIR} @@ -31,6 +32,15 @@ libgeom.3 gctl_rw_param.3 \ libgeom.3 gctl_issue.3 \ libgeom.3 gctl_free.3 \ - libgeom.3 gctl_dump.3 + libgeom.3 gctl_dump.3 \ + libgeom.3 g_close.3 \ + libgeom.3 g_delete.3 \ + libgeom.3 g_flush.3 \ + libgeom.3 g_get_ident.3 \ + libgeom.3 g_get_name.3 \ + libgeom.3 g_mediasize.3 \ + libgeom.3 g_open.3 \ + libgeom.3 g_open_by_ident.3 \ + libgeom.3 g_sectorsize.3 .include <bsd.lib.mk> ==== //depot/projects/wifi/lib/libgeom/libgeom.3#3 (text+ko) ==== @@ -1,4 +1,5 @@ .\" Copyright (c) 2003 Poul-Henning Kamp +.\" Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org> .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.7 2005/11/24 10:43:35 ru Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.8 2007/05/06 01:17:46 pjd Exp $ .\" -.Dd March 7, 2004 +.Dd May 6, 2007 .Dt LIBGEOM 3 .Os .Sh NAME @@ -44,7 +45,16 @@ .Nm gctl_rw_param , .Nm gctl_issue , .Nm gctl_free , -.Nm gctl_dump +.Nm gctl_dump , +.Nm g_open , +.Nm g_close , +.Nm g_mediasize , +.Nm g_sectorsize , +.Nm g_flush , +.Nm g_delete , +.Nm g_get_ident , +.Nm g_get_name , +.Nm g_open_by_ident .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -80,6 +90,25 @@ .Fn gctl_free "struct gctl_req *req" .Ft void .Fn gctl_dump "struct gctl_req *req" "FILE *f" +.Ss "Utility Functions" +.Ft int +.Fn g_open "const char *name" "int write" +.Ft int +.Fn g_close "int fd" +.Ft off_t +.Fn g_mediasize "int fd" +.Ft ssize_t +.Fn g_sectorsize "int fd" +.Ft int +.Fn g_flush "int fd" +.Ft int +.Fn g_delete "int fd" "off_t offset" "off_t length" +.Ft int +.Fn g_get_ident "int fd" "char *ident" "size_t size" +.Ft int +.Fn g_get_name "const char *ident" "char *name" "size_t size" +.Ft int +.Fn g_open_by_ident "const char *ident" "int write" "char *name" "size_t size" .Sh DESCRIPTION The .Nm geom @@ -232,6 +261,76 @@ .Dv NULL on success, or an error message corresponding to the first error which happened. +.Ss "Utility Functions" +The +.Fn g_* +functions are used to communicate with GEOM providers. +.Pp +The +.Fn g_open +function opens the given provider and returns file descriptor number, which can +be used with other functions. +The +.Fa write +argument indicates if operations that modify the provider (like +.Fn g_flush +or +.Fn g_delete ) +are going to be called. +.Pp +The +.Fn g_close +function closes the provider. +.Pp +The +.Fn g_mediasize +function returns size of the given provider. +.Pp +The +.Fn g_sectorsize +function returns sector size of the given provider. +.Pp +The +.Fn g_flush +function sends +.Dv BIO_FLUSH +request to flush write cache of the provider. +.Pp +The +.Fn g_delete +function tells the provider that the given data range is no longer used. +.Pp +The +.Fn g_get_ident +function returns provider's fixed and unique identifier. +The +.Fa ident +argument should be at least +.Dv DISK_IDENT_SIZE +big. +.Pp +The +.Fn g_get_name +function returns name of the provider, which identifier is equal to the +.Fa ident +string. +.Pp +The +.Fn g_open_by_ident +function opens provider using its ident, unlike +.Fn g_open +which uses provider's name. +If the +.Fa name +argument is not +.Dv NULL , +the function will store provider's name there. +.Pp +All functions return value greater than or equal to +.Va 0 +on success or +.Va -1 +on failure. .Sh EXAMPLES Create a request that is to be sent to the CCD class, and tell it to destroy a specific geom: @@ -256,3 +355,4 @@ .Sh AUTHORS .An Poul-Henning Kamp Aq phk@FreeBSD.org .An Lukas Ertl Aq le@FreeBSD.org +.An Pawel Jakub Dawidek pjd@FreeBSD.org ==== //depot/projects/wifi/lib/libgeom/libgeom.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.10 2004/03/09 21:14:18 jhb Exp $ + * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.12 2007/05/06 10:00:27 des Exp $ */ #ifndef _LIBGEOM_H_ #define _LIBGEOM_H_ @@ -44,10 +44,10 @@ void geom_stats_resync(void); int geom_stats_open(void); void *geom_stats_snapshot_get(void); -void geom_stats_snapshot_free(void *arg); -void geom_stats_snapshot_timestamp(void *arg, struct timespec *tp); -void geom_stats_snapshot_reset(void *arg); -struct devstat *geom_stats_snapshot_next(void *arg); +void geom_stats_snapshot_free(void *); +void geom_stats_snapshot_timestamp(void *, struct timespec *); +void geom_stats_snapshot_reset(void *); +struct devstat *geom_stats_snapshot_next(void *); char *geom_getxml(void); @@ -126,23 +126,34 @@ struct gconf lg_config; }; -struct gident * geom_lookupid(struct gmesh *gmp, const void *id); -int geom_xml2tree(struct gmesh *gmp, char *p); -int geom_gettree(struct gmesh *gmp); -void geom_deletetree(struct gmesh *gmp); +struct gident * geom_lookupid(struct gmesh *, const void *); +int geom_xml2tree(struct gmesh *, char *); +int geom_gettree(struct gmesh *); +void geom_deletetree(struct gmesh *); /* geom_ctl.c */ struct gctl_req; #ifdef _STDIO_H_ /* limit #include pollution */ -void gctl_dump(struct gctl_req *req, FILE *f); +void gctl_dump(struct gctl_req *, FILE *); #endif -void gctl_free(struct gctl_req *req); +void gctl_free(struct gctl_req *); struct gctl_req *gctl_get_handle(void); -const char *gctl_issue(struct gctl_req *req); -void gctl_ro_param(struct gctl_req *req, const char *name, int len, const void* val); -void gctl_rw_param(struct gctl_req *req, const char *name, int len, void* val); +const char *gctl_issue(struct gctl_req *); +void gctl_ro_param(struct gctl_req *, const char *, int, const void *); +void gctl_rw_param(struct gctl_req *, const char *, int, void *); + +/* geom_util.c */ +int g_open(const char *, int); +int g_close(int); +off_t g_mediasize(int); +ssize_t g_sectorsize(int); +int g_flush(int); +int g_delete(int, off_t, off_t); +int g_get_ident(int, char *, size_t); +int g_get_name(const char *, char *, size_t); +int g_open_by_ident(const char *, int, char *, size_t); __END_DECLS ==== //depot/projects/wifi/lib/libipsec/pfkey_dump.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.15 2004/02/11 04:34:34 bms Exp $"); +__FBSDID("$FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.16 2007/05/09 19:37:00 gnn Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -188,6 +188,9 @@ #ifdef SADB_X_EALG_AESCTR { SADB_X_EALG_AESCTR, "aes-ctr", }, #endif +#ifdef SADB_X_EALG_CAMELLIACBC + { SADB_X_EALG_CAMELLIACBC, "camellia-cbc", }, +#endif { -1, NULL, }, }; ==== //depot/projects/wifi/lib/libthr/thread/thr_init.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.45 2006/12/20 05:05:44 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.46 2007/05/09 08:39:33 davidxu Exp $ */ #include "namespace.h" @@ -66,7 +66,6 @@ int _thread_active_threads = 1; atfork_head _thr_atfork_list = TAILQ_HEAD_INITIALIZER(_thr_atfork_list); struct umutex _thr_atfork_lock = DEFAULT_UMUTEX; -int _thr_adaptive_spin = 0; struct pthread_prio _thr_priorities[3] = { {RTP_PRIO_MIN, RTP_PRIO_MAX, 0}, /* FIFO */ @@ -424,12 +423,6 @@ { size_t len; int mib[2]; - char *p; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705131209.l4DC9ggB036679>