Date: Fri, 5 Sep 2008 00:29:26 GMT From: Diego Giagio <diego@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 149232 for review Message-ID: <200809050029.m850TQSt011141@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149232 Change 149232 by diego@diego_black on 2008/09/05 00:28:40 IFC Affected files ... .. //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.mips#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/options#8 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/md/md.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uipaq.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/idt/std.idt#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ath_rate_onoe/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/bpf_jitter.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/ethernet.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/route.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/mount.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/tty.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/vnode.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/soc2008/diego-audit/src/sbin/ipfw/ipfw.8#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.215 2008/08/01 23:31:28 julian Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.216 2008/08/27 15:30:09 ivoras Exp $ .\" .Dd November 26, 2007 .Dt IPFW 8 @@ -1850,7 +1850,7 @@ .Em pipes can be used to set hard limits to the bandwidth that a flow can use, whereas .Em queues -can be used to determine how different flow share the available bandwidth. +can be used to determine how different flows share the available bandwidth. .Pp The .Em pipe ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ */ #include <machine/asmacros.h> @@ -109,8 +109,24 @@ movq %rsp,PCB_RSP(%r8) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq PCB_FSBASE(%r8),%r9 - movq PCB_GSBASE(%r8),%r10 + + /* + * Reread fs and gs bases. Explicit fs segment register load + * by the usermode code may change actual fs base without + * updating pcb_{fs,gs}base. + * + * %rdx still contains the mtx, save %rdx around rdmsr. + */ + movq %rdx,%r11 + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r9 + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r10 + movq %r11,%rdx testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_seg ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -734,6 +734,7 @@ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); + pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $"); #include "opt_compat.h" @@ -742,5 +742,6 @@ /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/soc2008/diego-audit/src/sys/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.28 2008/08/31 18:20:01 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -170,7 +170,8 @@ struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; int err; - u_char eaddr[6]; + u_char eaddr[ETHER_ADDR_LEN]; + uint32_t rnd; sc->dev = dev; err = ate_activate(dev); @@ -179,7 +180,7 @@ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; - /*Sysctls*/ + /* Sysctls */ sctx = device_get_sysctl_ctx(dev); soid = device_get_sysctl_tree(dev); SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "rmii", @@ -191,8 +192,25 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set\n"); - goto out; + /* + * No MAC address configured. Generate the random one. + */ + if (bootverbose) + device_printf(dev, + "Generating random ethernet address.\n"); + rnd = arc4random(); + + /* + * Set OUI to convenient locally assigned address. 'b' + * is 0x62, which has the locally assigned bit set, and + * the broadcast/multicast bit clear. + */ + eaddr[0] = 'b'; + eaddr[1] = 's'; + eaddr[2] = 'd'; + eaddr[3] = (rnd >> 16) & 0xff; + eaddr[4] = (rnd >> 8) & 0xff; + eaddr[5] = rnd & 0xff; } ate_set_mac(sc, eaddr); @@ -586,24 +604,29 @@ static int ate_get_mac(struct ate_softc *sc, u_char *eaddr) { + bus_size_t sa_low_reg[] = { ETH_SA1L, ETH_SA2L, ETH_SA3L, ETH_SA4L }; + bus_size_t sa_high_reg[] = { ETH_SA1H, ETH_SA2H, ETH_SA3H, ETH_SA4H }; uint32_t low, high; + int i; /* * The boot loader setup the MAC with an address, if one is set in - * the loader. The TSC loader will also set the MAC address in a - * similar way. Grab the MAC address from the SA1[HL] registers. + * the loader. Grab one MAC address from the SA[1-4][HL] registers. */ - low = RD4(sc, ETH_SA1L); - high = RD4(sc, ETH_SA1H); - if ((low | (high & 0xffff)) == 0) - return (ENXIO); - eaddr[0] = low & 0xff; - eaddr[1] = (low >> 8) & 0xff; - eaddr[2] = (low >> 16) & 0xff; - eaddr[3] = (low >> 24) & 0xff; - eaddr[4] = high & 0xff; - eaddr[5] = (high >> 8) & 0xff; - return (0); + for (i = 0; i < 4; i++) { + low = RD4(sc, sa_low_reg[i]); + high = RD4(sc, sa_high_reg[i]); + if ((low | (high & 0xffff)) != 0) { + eaddr[0] = low & 0xff; + eaddr[1] = (low >> 8) & 0xff; + eaddr[2] = (low >> 16) & 0xff; + eaddr[3] = (low >> 24) & 0xff; + eaddr[4] = high & 0xff; + eaddr[5] = (high >> 8) & 0xff; + return (0); + } + } + return (ENXIO); } static void ==== //depot/projects/soc2008/diego-audit/src/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/* * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.16 2008/03/12 16:01:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.17 2008/09/03 17:41:44 raj Exp $"); /*- * This module implements a "raw device" interface suitable for @@ -90,20 +90,21 @@ static int net_getparams(int sock); struct devsw netdev = { - "net", - DEVT_NET, - net_init, - net_strategy, - net_open, - net_close, - noioctl, - net_print + "net", + DEVT_NET, + net_init, + net_strategy, + net_open, + net_close, + noioctl, + net_print }; int net_init(void) { - return 0; + + return (0); } /* @@ -114,75 +115,74 @@ int net_open(struct open_file *f, ...) { - va_list args; - char *devname; /* Device part of file name (or NULL). */ - int error = 0; + va_list args; + char *devname; /* Device part of file name (or NULL). */ + int error = 0; - va_start(args, f); - devname = va_arg(args, char*); - va_end(args); + va_start(args, f); + devname = va_arg(args, char*); + va_end(args); - /* On first open, do netif open, mount, etc. */ - if (netdev_opens == 0) { - /* Find network interface. */ - if (netdev_sock < 0) { - netdev_sock = netif_open(devname); - if (netdev_sock < 0) { - printf("net_open: netif_open() failed\n"); - return (ENXIO); - } - if (debug) - printf("net_open: netif_open() succeeded\n"); - } - if (rootip.s_addr == 0) { - /* Get root IP address, and path, etc. */ - error = net_getparams(netdev_sock); - if (error) { + /* On first open, do netif open, mount, etc. */ + if (netdev_opens == 0) { + /* Find network interface. */ + if (netdev_sock < 0) { + netdev_sock = netif_open(devname); + if (netdev_sock < 0) { + printf("net_open: netif_open() failed\n"); + return (ENXIO); + } + if (debug) + printf("net_open: netif_open() succeeded\n"); + } + if (rootip.s_addr == 0) { + /* Get root IP address, and path, etc. */ + error = net_getparams(netdev_sock); + if (error) { /* getparams makes its own noise */ - netif_close(netdev_sock); - netdev_sock = -1; - return (error); - } + netif_close(netdev_sock); + netdev_sock = -1; + return (error); + } + } } - } - netdev_opens++; - f->f_devdata = &netdev_sock; - return (error); + netdev_opens++; + f->f_devdata = &netdev_sock; + return (error); } int -net_close(f) - struct open_file *f; +net_close(struct open_file *f) { - #ifdef NETIF_DEBUG - if (debug) - printf("net_close: opens=%d\n", netdev_opens); + if (debug) + printf("net_close: opens=%d\n", netdev_opens); #endif - /* On last close, do netif close, etc. */ - f->f_devdata = NULL; - /* Extra close call? */ - if (netdev_opens <= 0) + /* On last close, do netif close, etc. */ + f->f_devdata = NULL; + /* Extra close call? */ + if (netdev_opens <= 0) + return (0); + netdev_opens--; + /* Not last close? */ + if (netdev_opens > 0) + return(0); + rootip.s_addr = 0; + if (netdev_sock >= 0) { + if (debug) + printf("net_close: calling netif_close()\n"); + netif_close(netdev_sock); + netdev_sock = -1; + } return (0); - netdev_opens--; - /* Not last close? */ - if (netdev_opens > 0) - return(0); - rootip.s_addr = 0; - if (netdev_sock >= 0) { - if (debug) - printf("net_close: calling netif_close()\n"); - netif_close(netdev_sock); - netdev_sock = -1; - } - return (0); } int net_strategy() { - return EIO; + + return (EIO); } #define SUPPORT_BOOTP @@ -205,106 +205,118 @@ extern n_long ip_convertaddr(char *p); static int -net_getparams(sock) - int sock; +net_getparams(int sock) { - char buf[MAXHOSTNAMELEN]; - char temp[FNAME_SIZE]; - struct iodesc *d; - int i; - n_long smask; + char buf[MAXHOSTNAMELEN]; + char temp[FNAME_SIZE]; + struct iodesc *d; + int i; + n_long smask; #ifdef SUPPORT_BOOTP - /* - * Try to get boot info using BOOTP. If we succeed, then - * the server IP address, gateway, and root path will all - * be initialized. If any remain uninitialized, we will - * use RARP and RPC/bootparam (the Sun way) to get them. - */ - if (try_bootp) - bootp(sock, BOOTP_NONE); - if (myip.s_addr != 0) - goto exit; - if (debug) - printf("net_open: BOOTP failed, trying RARP/RPC...\n"); + /* + * Try to get boot info using BOOTP. If we succeed, then + * the server IP address, gateway, and root path will all + * be initialized. If any remain uninitialized, we will + * use RARP and RPC/bootparam (the Sun way) to get them. + */ + if (try_bootp) + bootp(sock, BOOTP_NONE); + if (myip.s_addr != 0) + goto exit; + if (debug) + printf("net_open: BOOTP failed, trying RARP/RPC...\n"); #endif - /* - * Use RARP to get our IP address. This also sets our - * netmask to the "natural" default for our address. - */ - if (rarp_getipaddress(sock)) { - printf("net_open: RARP failed\n"); - return (EIO); - } - printf("net_open: client addr: %s\n", inet_ntoa(myip)); + /* + * Use RARP to get our IP address. This also sets our + * netmask to the "natural" default for our address. + */ + if (rarp_getipaddress(sock)) { + printf("net_open: RARP failed\n"); + return (EIO); + } + printf("net_open: client addr: %s\n", inet_ntoa(myip)); - /* Get our hostname, server IP address, gateway. */ - if (bp_whoami(sock)) { - printf("net_open: bootparam/whoami RPC failed\n"); - return (EIO); - } - if (debug) - printf("net_open: client name: %s\n", hostname); + /* Get our hostname, server IP address, gateway. */ + if (bp_whoami(sock)) { + printf("net_open: bootparam/whoami RPC failed\n"); + return (EIO); + } + if (debug) + printf("net_open: client name: %s\n", hostname); - /* - * Ignore the gateway from whoami (unreliable). - * Use the "gateway" parameter instead. - */ - smask = 0; - gateip.s_addr = 0; - if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { - /* Got it! Parse the netmask. */ - smask = ip_convertaddr(buf); - } - if (smask) { - netmask = smask; - if (debug) - printf("net_open: subnet mask: %s\n", intoa(netmask)); - } - if (gateip.s_addr && debug) - printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); + /* + * Ignore the gateway from whoami (unreliable). + * Use the "gateway" parameter instead. + */ + smask = 0; + gateip.s_addr = 0; + if (bp_getfile(sock, "gateway", &gateip, buf) == 0) { + /* Got it! Parse the netmask. */ + smask = ip_convertaddr(buf); + } + if (smask) { + netmask = smask; + if (debug) + printf("net_open: subnet mask: %s\n", intoa(netmask)); + } + if (gateip.s_addr && debug) + printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); - /* Get the root server and pathname. */ - if (bp_getfile(sock, "root", &rootip, rootpath)) { - printf("net_open: bootparam/getfile RPC failed\n"); - return (EIO); - } - exit: - /* - * If present, strip the server's address off of the rootpath - * before passing it along. This allows us to be compatible with - * the kernel's diskless (BOOTP_NFSROOT) booting conventions - */ - for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) - if (rootpath[i] == ':') - break; - if (i && i != FNAME_SIZE && rootpath[i] == ':') { - rootpath[i++] = '\0'; - if (inet_addr(&rootpath[0]) != INADDR_NONE) - rootip.s_addr = inet_addr(&rootpath[0]); - bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); - bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); - } - if (debug) { - printf("net_open: server addr: %s\n", inet_ntoa(rootip)); - printf("net_open: server path: %s\n", rootpath); - } + /* Get the root server and pathname. */ + if (bp_getfile(sock, "root", &rootip, rootpath)) { + printf("net_open: bootparam/getfile RPC failed\n"); + return (EIO); + } +exit: + /* + * If present, strip the server's address off of the rootpath + * before passing it along. This allows us to be compatible with + * the kernel's diskless (BOOTP_NFSROOT) booting conventions + */ + for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) + if (rootpath[i] == ':') + break; + if (i && i != FNAME_SIZE && rootpath[i] == ':') { + rootpath[i++] = '\0'; + if (inet_addr(&rootpath[0]) != INADDR_NONE) + rootip.s_addr = inet_addr(&rootpath[0]); + bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); + bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); + } + if (debug) { + printf("net_open: server addr: %s\n", inet_ntoa(rootip)); + printf("net_open: server path: %s\n", rootpath); + } - d = socktodesc(sock); - sprintf(temp, "%6D", d->myea, ":"); - setenv("boot.netif.ip", inet_ntoa(myip), 1); - setenv("boot.netif.netmask", intoa(netmask), 1); - setenv("boot.netif.gateway", inet_ntoa(gateip), 1); - setenv("boot.netif.hwaddr", temp, 1); - setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); - setenv("boot.nfsroot.path", rootpath, 1); + d = socktodesc(sock); + sprintf(temp, "%6D", d->myea, ":"); + setenv("boot.netif.ip", inet_ntoa(myip), 1); + setenv("boot.netif.netmask", intoa(netmask), 1); + setenv("boot.netif.gateway", inet_ntoa(gateip), 1); + setenv("boot.netif.hwaddr", temp, 1); + setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); + setenv("boot.nfsroot.path", rootpath, 1); - return (0); + return (0); } static void net_print(int verbose) { - return; + struct netif_driver *drv; + int i, d, cnt; + + cnt = 0; + for (d = 0; netif_drivers[d]; d++) { + drv = netif_drivers[d]; + for (i = 0; i < drv->netif_nifs; i++) { + printf("\t%s%d:", "net", cnt++); + if (verbose) + printf(" (%s%d)", drv->netif_bname, + drv->netif_ifs[i].dif_unit); + } + } + printf("\n"); } ==== //depot/projects/soc2008/diego-audit/src/sys/boot/common/devopen.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.5 2006/11/02 00:02:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.6 2008/09/03 17:41:44 raj Exp $"); #include <stand.h> #include <string.h> @@ -35,32 +35,33 @@ int devopen(struct open_file *f, const char *fname, const char **file) { - struct devdesc *dev; - int result; + struct devdesc *dev; + int result; - result = archsw.arch_getdev((void **)&dev, fname, file); - if (result) - return (result); + result = archsw.arch_getdev((void **)&dev, fname, file); + if (result) + return (result); - /* point to device-specific data so that device open can use it */ - f->f_devdata = dev; - result = dev->d_dev->dv_open(f, dev); - if (result != 0) { - f->f_devdata = NULL; - free(dev); - return (result); - } + /* point to device-specific data so that device open can use it */ + f->f_devdata = dev; + result = dev->d_dev->dv_open(f, dev); + if (result != 0) { + f->f_devdata = NULL; + free(dev); + return (result); + } - /* reference the devsw entry from the open_file structure */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809050029.m850TQSt011141>