Date: Sun, 15 Mar 2009 06:44:24 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 159228 for review Message-ID: <200903150644.n2F6iOf2055359@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159228 Change 159228 by julian@julian_trafmon1 on 2009/03/15 06:43:36 IFC latest Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#5 integrate .. //depot/projects/vimage/src/share/man/man4/altq.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/amdtemp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/igmp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ip.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/k8temp.4#2 delete .. //depot/projects/vimage/src/share/man/man4/multicast.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/txp.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/uplcom.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/usb2_bluetooth.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_controller.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_ethernet.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_image.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_input.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_misc.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_ndis.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_quirk.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_serial.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_sound.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_storage.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_wlan.4#2 delete .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/vimage/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/vimage/src/share/man/man8/diskless.8#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/vimage/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcpu.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#14 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#8 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#9 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#6 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#6 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#29 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/vimage/src/sys/conf/files#58 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#21 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#28 integrate .. //depot/projects/vimage/src/sys/conf/options.amd64#7 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#10 integrate .. //depot/projects/vimage/src/sys/ddb/db_expr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/vimage/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/vimage/src/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#31 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#19 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#21 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcefw.h#9 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#14 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_core.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_dev.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#11 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#11 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#16 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#24 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#21 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#12 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#12 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/vimage/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/tdfx_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/vimage/src/sys/dev/exca/exca.c#5 integrate .. //depot/projects/vimage/src/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#9 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/vimage/src/sys/dev/k8temp/k8temp.c#6 delete .. //depot/projects/vimage/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#11 integrate .. //depot/projects/vimage/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#13 integrate .. //depot/projects/vimage/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis.c#6 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#20 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#8 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#14 integrate .. //depot/projects/vimage/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/vimage/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#23 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.h#5 delete .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#6 delete .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudioreg.h#4 delete .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_bus_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_if.m#4 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#44 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#7 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#10 integrate .. //depot/projects/vimage/src/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/vimage/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/vimage/src/sys/geom/geom_redboot.c#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#28 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#17 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#14 integrate .. //depot/projects/vimage/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#8 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux.h#10 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#18 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_tc.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#30 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#16 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#24 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#13 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#10 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#6 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#23 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#11 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#41 integrate .. //depot/projects/vimage/src/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/usb/Makefile#6 delete .. //depot/projects/vimage/src/sys/net/bpf.c#33 integrate .. //depot/projects/vimage/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/vimage/src/sys/net/if.c#69 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#11 integrate .. //depot/projects/vimage/src/sys/net/netisr.h#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/igmp_var.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#51 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#27 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#49 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#43 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#20 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#23 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#20 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#52 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#19 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#37 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#16 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.h#11 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#18 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#16 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#17 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#17 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/vimage/src/sys/sys/aio.h#3 integrate .. //depot/projects/vimage/src/sys/sys/buf.h#5 integrate .. //depot/projects/vimage/src/sys/sys/diskpc98.h#2 integrate .. //depot/projects/vimage/src/sys/sys/fcntl.h#6 integrate .. //depot/projects/vimage/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/vimage/src/sys/sys/ktrace.h#3 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#16 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#19 integrate .. //depot/projects/vimage/src/sys/sys/param.h#44 integrate .. //depot/projects/vimage/src/sys/sys/pipe.h#3 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#28 integrate .. //depot/projects/vimage/src/sys/sys/sem.h#2 integrate .. //depot/projects/vimage/src/sys/sys/shm.h#4 integrate .. //depot/projects/vimage/src/sys/sys/stat.h#4 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#33 integrate .. //depot/projects/vimage/src/sys/sys/syslog.h#2 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#17 integrate .. //depot/projects/vimage/src/sys/sys/termios.h#7 integrate .. //depot/projects/vimage/src/sys/sys/time.h#6 integrate .. //depot/projects/vimage/src/sys/sys/uio.h#2 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#81 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#19 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#20 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_init.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#7 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn_dev.c#4 integrate .. //depot/projects/vimage/src/sys/xen/features.c#3 integrate .. //depot/projects/vimage/src/sys/xen/features.h#1 branch .. //depot/projects/vimage/src/sys/xen/gnttab.c#7 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.h#6 integrate .. //depot/projects/vimage/src/sys/xen/hypervisor.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/vimage/src/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/vimage/src/sys/xen/reboot.c#1 branch .. //depot/projects/vimage/src/sys/xen/xen_intr.h#2 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#6 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#7 integrate .. //depot/projects/vimage/src/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/vimage/src/usr.bin/kdump/kdump.c#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.441 2009/01/23 05:53:49 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.443 2009/03/13 16:42:24 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -26,6 +26,7 @@ ale.4 \ altq.4 \ amd.4 \ + ${_amdtemp.4} \ ${_amdsmb.4} \ amr.4 \ an.4 \ @@ -129,6 +130,7 @@ if_bridge.4 \ ifmib.4 \ igb.4 \ + igmp.4 \ iic.4 \ iicbb.4 \ iicbus.4 \ @@ -155,7 +157,6 @@ ixgbe.4 \ jme.4 \ joy.4 \ - ${_k8temp.4} \ kbdmux.4 \ keyboard.4 \ kld.4 \ @@ -594,6 +595,7 @@ _acpi_sony.4= acpi_sony.4 _acpi_toshiba.4=acpi_toshiba.4 _amdsmb.4= amdsmb.4 +_amdtemp.4= amdtemp.4 _asmc.4= asmc.4 _coretemp.4= coretemp.4 _cpuctl.4= cpuctl.4 @@ -611,7 +613,6 @@ _io.4= io.4 _linux.4= linux.4 _ndis.4= ndis.4 -_k8temp.4= k8temp.4 _nfe.4= nfe.4 _nfsmb.4= nfsmb.4 _nve.4= nve.4 ==== //depot/projects/vimage/src/share/man/man4/altq.4#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.37 2008/11/12 10:31:06 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.38 2009/03/12 01:21:48 yongari Exp $ .\" -.Dd November 12, 2008 +.Dd March 12, 2009 .Dt ALTQ 4 .Os .Sh NAME @@ -152,6 +152,7 @@ .Xr sk 4 , .Xr ste 4 , .Xr stge 4 , +.Xr txp 4 , .Xr udav 4 , .Xr ural 4 , .Xr vge 4 , ==== //depot/projects/vimage/src/share/man/man4/ip.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.49 2007/06/12 16:24:55 bms Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.51 2009/03/09 17:53:05 bms Exp $ .\" -.Dd April 9, 2007 +.Dd March 9, 2009 .Dt IP 4 .Os .Sh NAME @@ -404,8 +404,9 @@ Multicast datagrams with TTL greater than 1 may be forwarded to other networks if a multicast router is attached to the local network. .Pp -For hosts with multiple interfaces, each multicast transmission is -sent from the primary network interface. +For hosts with multiple interfaces, where an interface has not +been specified for a multicast group membership, +each multicast transmission is sent from the primary network interface. The .Dv IP_MULTICAST_IF option overrides the default for @@ -423,12 +424,25 @@ .Pp To specify an interface by index, an instance of .Vt ip_mreqn -should be passed instead. +may be passed instead. The .Vt imr_ifindex member should be set to the index of the desired interface, or 0 to specify the default interface. The kernel differentiates between these two structures by their size. +.Pp +The use of +.Vt IP_MULTICAST_IF +is +.Em not recommended , +as multicast memberships are scoped to each +individual interface. +It is supported for legacy use only by applications, +such as routing daemons, which expect to +be able to transmit link-local IPv4 multicast datagrams (224.0.0.0/24) +on multiple interfaces, +without requesting an individual membership for each interface. +.Pp .\" An interface's local IP address and multicast capability can be obtained via the @@ -452,13 +466,19 @@ .Pp This option improves performance for applications that may have no more than one -instance on a single host (such as a router daemon), by eliminating +instance on a single host (such as a routing daemon), by eliminating the overhead of receiving their own transmissions. It should generally not be used by applications for which there may be more than one instance on a single host (such as a conferencing program) or for which the sender does not belong to the destination group (such as a time querying program). .Pp +The sysctl setting +.Va net.inet.ip.mcast.loop +controls the default setting of the +.Dv IP_MULTICAST_LOOP +socket option for new sockets. +.Pp A multicast datagram sent with an initial TTL greater than 1 may be delivered to the sending host on a different interface from that on which it was sent, if the host belongs to the destination group on that other interface. @@ -485,24 +505,32 @@ .Ed .Pp .Va imr_interface -should be set to -.Dv INADDR_ANY -to choose the default multicast interface, -or the +should be set to the .Tn IP address of a particular multicast-capable interface if the host is multihomed. -.\" TODO: Remove this piece when the RFC 3678 API is implemented and -.\" the RFC 1724 hack is removed. -Since -.Fx 4.4 , +It may be set to +.Dv INADDR_ANY +to choose the default interface, although this is not recommended; +this is considered to be the first interface corresponding +to the default route. +Otherwise, the first multicast-capable interface +configured in the system will be used. +.Pp +Prior to +.Fx 7.0 , if the .Va imr_interface member is within the network range .Li 0.0.0.0/8 , it is treated as an interface index in the system interface MIB, as per the RIP Version 2 MIB Extension (RFC-1724). -.\" TODO: Update this piece when IPv4 source-address selection is implemented. +In versions of +.Fx +since 7.0, this behavior is no longer supported. +Developers should +instead use the RFC 3678 multicast source filter APIs; in particular, +.Dv MCAST_JOIN_GROUP . .Pp Up to .Dv IP_MAX_MEMBERSHIPS @@ -511,24 +539,130 @@ programs running on multihomed hosts may need to join the same group on more than one interface. .Pp +To drop a membership, use: +.Bd -literal +struct ip_mreq mreq; +setsockopt(s, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)); +.Ed +.Pp +where +.Fa mreq +contains the same values as used to add the membership. +Memberships are dropped when the socket is closed or the process exits. +.\" TODO: Update this piece when IPv4 source-address selection is implemented. +.Pp The IGMP protocol uses the primary IP address of the interface as its identifier for group membership. +This is the first IP address configured on the interface. +If this address is removed or changed, the results are +undefined, as the IGMP membership state will then be inconsistent. If multiple IP aliases are configured on the same interface, they will be ignored. +.Pp This shortcoming was addressed in IPv6; MLDv2 requires that the unique link-local address for an interface is used to identify an MLDv2 listener. +.Ss "Source-Specific Multicast Options" +Since +.Fx 8.0 , +the use of Source-Specific Multicast (SSM) is supported. +These extensions require an IGMPv3 multicast router in order to +make best use of them. +If a legacy multicast router is present on the link, +.Fx +will simply downgrade to the version of IGMP spoken by the router, +and the benefits of source filtering on the upstream link +will not be present, although the kernel will continue to +squelch transmissions from blocked sources. +.Pp +Each group membership on a socket now has a filter mode: +.Bl -tag -width MCAST_EXCLUDE +.It Dv MCAST_EXCLUDE +Datagrams sent to this group are accepted, +unless the source is in a list of blocked source addresses. +.It Dv MCAST_INCLUDE +Datagrams sent to this group are accepted +only if the source is in a list of accepted source addresses. +.El +.Pp +Groups joined using the legacy +.Dv IP_ADD_MEMBERSHIP +option are placed in exclusive-mode, +and are able to request that certain sources are blocked or allowed. +This is known as the +.Em delta-based API . .Pp -To drop a membership, use: +To block a multicast source on an existing group membership: .Bd -literal -struct ip_mreq mreq; -setsockopt(s, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)); +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_BLOCK_SOURCE, &mreqs, sizeof(mreqs)); .Ed .Pp where -.Fa mreq -contains the same values as used to add the membership. -Memberships are dropped when the socket is closed or the process exits. +.Fa mreqs +is the following structure: +.Bd -literal +struct ip_mreq_source { + struct in_addr imr_multiaddr; /* IP multicast address of group */ + struct in_addr imr_sourceaddr; /* IP address of source */ + struct in_addr imr_interface; /* local IP address of interface */ +} +.Ed +.Va imr_sourceaddr +should be set to the address of the source to be blocked. +.Pp +To unblock a multicast source on an existing group: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_UNBLOCK_SOURCE, &mreqs, sizeof(mreqs)); +.Ed +.Pp +The +.Dv IP_BLOCK_SOURCE +and +.Dv IP_UNBLOCK_SOURCE +options are +.Em not permitted +for inclusive-mode group memberships. +.Pp +To join a multicast group in +.Dv MCAST_INCLUDE +mode with a single source, +or add another source to an existing inclusive-mode membership: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP, &mreqs, sizeof(mreqs)); +.Ed +.Pp +To leave a single source from an existing group in inclusive mode: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, &mreqs, sizeof(mreqs)); +.Ed +If this is the last accepted source for the group, the membership +will be dropped. +.Pp +The +.Dv IP_ADD_SOURCE_MEMBERSHIP +and +.Dv IP_DROP_SOURCE_MEMBERSHIP +options are +.Em not accepted +for exclusive-mode group memberships. +However, both exclusive and inclusive mode memberships +support the use of the +.Em full-state API +documented in RFC 3678. +For management of source filter lists using this API, +please refer to +.Xr sourcefilter 3 . +.Pp +The sysctl settings +.Va net.inet.ip.mcast.maxsocksrc +and +.Va net.inet.ip.mcast.maxgrpsrc +are used to specify an upper limit on the number of per-socket and per-group +source filter entries which the kernel may allocate. .\"----------------------- .Ss "Raw IP Sockets" .Pp @@ -674,9 +808,19 @@ .Xr send 2 , .Xr byteorder 3 , .Xr icmp 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr intro 4 , -.Xr multicast 4 +.Xr multicast 4 , +.Xr sourcefilter 3 +.Rs +.%A D. Thaler +.%A B. Fenner +.%A B. Quinn +.%T "Socket Interface Extensions for Multicast Source Filters" +.%N RFC 3678 +.%D Jan 2004 +.Re .Sh HISTORY The .Nm ==== //depot/projects/vimage/src/share/man/man4/multicast.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.6 2007/03/18 15:34:57 bms Exp $ +.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.8 2009/03/09 17:53:05 bms Exp $ .\" -.Dd March 18, 2007 +.Dd February 13, 2009 .Dt MULTICAST 4 .Os .\" @@ -954,7 +954,9 @@ .Xr recvmsg 2 , .Xr setsockopt 2 , .Xr socket 2 , +.Xr sourcefilter 3 , .Xr icmp6 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr inet6 4 , .Xr intro 4 , ==== //depot/projects/vimage/src/share/man/man4/txp.4#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/txp.4,v 1.13 2005/11/18 10:52:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/txp.4,v 1.14 2009/03/12 01:27:15 yongari Exp $ .\" -.Dd July 16, 2005 +.Dd March 12, 2009 .Dt TXP 4 .Os .Sh NAME @@ -134,6 +134,7 @@ 3Com 3cR990B-SRV .El .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr inet 4 , .Xr intro 4 , ==== //depot/projects/vimage/src/share/man/man4/uplcom.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.17 2008/06/10 19:33:31 imp Exp $ +.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.18 2009/03/04 03:47:57 thompsa Exp $ .\" .Dd November 22, 2006 .Dt UPLCOM 4 @@ -98,6 +98,8 @@ .It I/O DATA USB-RSAQ3 .It +Mobile Action MA-620 Infrared Adapter +.It PLANEX USB-RS232 URS-03 .It RATOC REX-USB60 ==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.356 2009/02/17 11:55:50 mtm Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.357 2009/03/13 07:12:25 brooks Exp $ .\" .Dd January 27, 2009 .Dt RC.CONF 5 @@ -1169,6 +1169,15 @@ .Xr wlan 4 devices must be created for each wireless devices as of .Fx 8.0 . +Debugging flags for +.Xr wlan 4 +devices as set by +.Xr wlandebug 8 +may be specified with an +.Va wlandebug_ Ns Aq Ar interface +variable. +The contents of this variable will be passed directly to +.Xr wlandebug 8 . .Pp If the .Va ifconfig_ Ns Aq Ar interface @@ -4065,6 +4074,7 @@ .Xr sysctl 8 , .Xr syslogd 8 , .Xr timed 8 , +.Xr wlandebug 8 , .Xr yp 8 , .Xr ypbind 8 , .Xr ypserv 8 , ==== //depot/projects/vimage/src/share/man/man7/tuning.7#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.79 2009/01/27 00:23:43 trhodes Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.80 2009/03/09 05:41:04 delphij Exp $ .\" .Dd January 23, 2009 .Dt TUNING 7 @@ -51,7 +51,9 @@ and use any remaining space for .Pa /home . .Pp -You should typically size your swap space to approximately 2x main memory. +You should typically size your swap space to approximately 2x main memory +for systems with less than 2GB of RAM, or approximately 1x main memory +if you have more. If you do not have a lot of RAM, though, you will generally want a lot more swap. It is not recommended that you configure any less than ==== //depot/projects/vimage/src/share/man/man8/diskless.8#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.30 2005/12/30 14:43:31 ceri Exp $ +.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.31 2009/03/13 23:42:34 rwatson Exp $ .\" .Dd December 10, 2005 .Dt DISKLESS 8 @@ -376,7 +376,6 @@ .Bd -literal -offset indent <SERVER>:<ROOT> / nfs ro 0 0 <SERVER>:/usr /usr nfs ro 0 0 -proc /proc procfs rw 0 0 .Ed .Pp You also need to create a customized version of ==== //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.1 2008/12/12 01:08:28 marcus Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.2 2009/03/08 19:07:44 marcus Exp $ .\" .Dd December 7, 2008 .Os @@ -57,7 +57,13 @@ .Pp The default implementation of .Nm -simply returns ENOENT. +scans through +.Fa vp Ns 's +parent directory looking for a dirent with a matching file number. If +.Fa vp +is not a directory, then +.Nm +returns ENOENT. .Sh LOCKS The vnode should be locked on entry and will still be locked on exit. The parent directory vnode will be unlocked on a successful exit. However, it ==== //depot/projects/vimage/src/sys/amd64/acpica/madt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.26 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -483,6 +483,10 @@ apic->Id); if (ioapics[apic->Id].io_apic != NULL) panic("%s: Double APIC ID %u", __func__, apic->Id); + if (apic->GlobalIrqBase >= FIRST_MSI_INT) { + printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903150644.n2F6iOf2055359>