Date: Mon, 29 Jun 2009 08:41:30 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 165374 for review Message-ID: <200906290841.n5T8fU2x076346@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=165374 Change 165374 by mav@mav_mavbook on 2009/06/29 08:40:35 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#5 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#7 integrate .. //depot/projects/scottl-camlock/src/UPDATING#8 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libssp/libssp_nonshared/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/stack_protector.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/release/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/release/scripts/package-split.py#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_internal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/ustorage_fs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_controller.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_if.m#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/sys_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_socket.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cluster.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_extattr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/netisr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ksocket.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/nfs/nfs_nfssvc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/include/vm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_syscalls.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pmap.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/event.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/filio.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#18 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/doc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.h#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.625 2009/06/14 15:16:24 markm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.627 2009/06/29 01:33:59 kan Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.197 2009/06/24 17:01:17 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.198 2009/06/27 10:11:15 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -15,57 +15,72 @@ # # 20090624: update usbdi(9) -OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9 -OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9 -OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9 -OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9 -OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9 -OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9 -OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9 -OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9 -OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9 -OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9 -OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9 -OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9 -OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9 -OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9 -OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9 -OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9 -OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9 -OLD_FILES+=usr/share/man/man9/usbd_get_config.9 -OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9 -OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9 -OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9 -OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9 -OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9 -OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9 -OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9 -OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9 -OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9 -OLD_FILES+=usr/share/man/man9/usbd_get_speed.9 -OLD_FILES+=usr/share/man/man9/usbd_get_string.9 -OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9 -OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9 -OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9 -OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9 -OLD_FILES+=usr/share/man/man9/usbd_interface_count.9 -OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9 -OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9 -OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9 -OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9 -OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9 -OLD_FILES+=usr/share/man/man9/usbd_set_interface.9 -OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9 -OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9 -OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9 -OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9 -OLD_FILES+=usr/share/man/man9/usbd_transfer.9 -OLD_FILES+=usr/share/man/man9/usb_find_desc.9 +OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz +OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz +OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9.gz +OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9.gz +OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9.gz +OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9.gz +OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9.gz +OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9.gz +OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9.gz +OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9.gz +OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_config.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_speed.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_string.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9.gz +OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9.gz +OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9.gz +OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9.gz +OLD_FILES+=usr/share/man/man9/usbd_interface_count.9.gz +OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9.gz +OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9.gz +OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9.gz +OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9.gz +OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9.gz +OLD_FILES+=usr/share/man/man9/usbd_set_interface.9.gz +OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer.9.gz +OLD_FILES+=usr/share/man/man9/usb_find_desc.9.gz +# 20090623: number of headers needed for a usb driver reduced +OLD_FILES+=usr/include/dev/usb/usb_defs.h +OLD_FILES+=usr/include/dev/usb/usb_error.h +OLD_FILES+=usr/include/dev/usb/usb_handle_request.h +OLD_FILES+=usr/include/dev/usb/usb_hid.h +OLD_FILES+=usr/include/dev/usb/usb_lookup.h +OLD_FILES+=usr/include/dev/usb/usb_mfunc.h +OLD_FILES+=usr/include/dev/usb/usb_parse.h +OLD_FILES+=usr/include/dev/usb/usb_revision.h +# 20090609: devclass_add_driver is no longer public +OLD_FILES+=usr/share/man/man9/devclass_add_driver.9.gz +OLD_FILES+=usr/share/man/man9/devclass_delete_driver.9.gz +OLD_FILES+=usr/share/man/man9/devclass_find_driver.9.gz # 20090605: removal of clists OLD_FILES+=usr/include/sys/clist.h # 20090602: removal of window(1) OLD_FILES+=usr/bin/window OLD_FILES+=usr/share/man/man1/window.1.gz +# 20090531: bind 9.6.1rc1 import +OLD_LIBS+=usr/lib/liblwres.so.30 # 20090530: removal of early.sh OLD_FILES+=etc/rc.d/early.sh # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER() @@ -105,7 +120,7 @@ OLD_DIRS+=usr/include/legacy/dev OLD_DIRS+=usr/include/legacy # 20090526: removal of makekey(8) -OLD_FILES+=libexec/makekey +OLD_FILES+=usr/libexec/makekey OLD_FILES+=usr/share/man/man8/makekey.8.gz # 20090522: removal of University of Michigan NFSv4 client OLD_FILES+=etc/rc.d/idmapd ==== //depot/projects/scottl-camlock/src/UPDATING#8 (text+ko) ==== @@ -22,6 +22,18 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090628: + The documentation from the FreeBSD Documentation Project + (Handbook, FAQ, etc.) is now installed via packages by + sysinstall(8) and under the /usr/local/share/doc/freebsd + directory instead of /usr/share/doc. + +20090624: + The ABI of various structures related to the SYSV IPC API have + been changed. As a result, the COMPAT_FREEBSD[456] kernel + options now all require COMPAT_FREEBSD7. Bump __FreeBSD_version + to 800100. + 20090622: Layout of struct vnet has changed as routing related variables were moved to their own Vimage module. Modules need to be @@ -1618,4 +1630,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.622 2009/06/26 01:10:10 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.624 2009/06/28 08:59:46 blackend Exp $ ==== //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.63 2009/02/13 16:51:36 jkim Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.65 2009/06/29 01:33:59 kan Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs ==== //depot/projects/scottl-camlock/src/gnu/lib/libssp/libssp_nonshared/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libssp/libssp_nonshared/Makefile,v 1.1 2007/05/19 04:25:56 kan Exp $ +# $FreeBSD: src/gnu/lib/libssp/libssp_nonshared/Makefile,v 1.3 2009/06/29 01:33:59 kan Exp $ GCCDIR= ${.CURDIR}/../../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.29 2007/10/12 17:49:12 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.31 2009/06/29 01:33:59 kan Exp $ */ /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD source tree so it can be configured appropriately without using ==== //depot/projects/scottl-camlock/src/lib/libc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.75 2009/03/13 10:40:38 gabor Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.77 2009/06/29 01:33:59 kan Exp $ SHLIBDIR?= /lib ==== //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#6 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.24 2009/06/24 21:10:52 jhb Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.26 2009/06/29 01:33:59 kan Exp $ */ /* ==== //depot/projects/scottl-camlock/src/lib/libc/sys/stack_protector.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.2 2007/06/05 08:24:34 des Exp $ */ +/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.4 2009/06/29 01:33:59 kan Exp $ */ /* $NetBSD: stack_protector.c,v 1.4 2006/11/22 17:23:25 christos Exp $ */ /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */ /* @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.2 2007/06/05 08:24:34 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.4 2009/06/29 01:33:59 kan Exp $"); #include <sys/param.h> #include <sys/sysctl.h> ==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.43 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.45 2009/06/29 01:33:59 kan Exp $ .include <bsd.own.mk> MK_SSP= no ==== //depot/projects/scottl-camlock/src/release/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.942 2009/06/25 04:25:26 marcel Exp $ +# $FreeBSD: src/release/Makefile,v 1.943 2009/06/28 08:59:46 blackend Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -39,6 +39,10 @@ # checking out from a local CVS repository, set this option. #EXTPORTSDIR=/usr/ports # +# To use a checked-out doc/ directory instead of +# checking out from a local CVS repository, set this option. +#EXTDOCDIR=/usr/doc +# # To add other options to the CVS subcommands (co,up), set #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'" # @@ -91,15 +95,13 @@ # the ports tree, so NOPORTS can be set together with NODOC in order # to have neither ports or docs. If only NOPORTS is set to YES, but # docs are still desired, the DOMINIMALDOCPORTS logic below will only -# install the ports that are minimally required for the docs. This is +# install the ports that are minimally required for the release note documentation. This is # intended as a compromise, less disk space is required than for using # the entire ports collection (and much less time due to the huge number # of directories it would create), but still quite a bit as well as some # CPU cycles (some of the programs are C++, and things like ghostscript # belong to the required ports nevertheless). # -# Setting this also disables building of release note documentation -# (RELNOTESng). #NODOC= YES #NOPORTS= YES @@ -141,11 +143,6 @@ # # Doing 'make index' in /usr/ports requires Perl. MAKEINDEXPORTS= lang/perl5.8 -# By default, documentation (Handbook, FAQ, etc.) is built for all -# the languages. To speed up building, set the DOC_LANG to just -# the languages you need. (The language for the release notes is -# controlled by the RELNOTES_LANG variable above.) -#DOC_LANG= en_US.ISO8859-1 DOCPORTS= textproc/docproj # Set this to wherever the distfiles required by release procedures. .if defined(DOCDISTFILES) @@ -348,7 +345,7 @@ @echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false .endif .if defined(NOPORTSATALL) && !defined(NODOC) - @echo "Ports are required for building the docs. Either set NODOC or" + @echo "Ports are required for building the release docs. Either set NODOC or" @echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!" @exit 1 .endif @@ -477,7 +474,6 @@ BUILDNAME \ CD_PACKAGE_TREE \ DISTRIBUTIONS \ - DOC_LANG \ DOMINIMALDOCPORTS \ EXTRA_SRC \ FTP_PASSIVE_MODE \ @@ -1037,22 +1033,8 @@ @echo "Building CDROM docs filesystem image" @mkdir -p ${CD_DOCS} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf - @mkdir -p ${CD_DOCS}/usr/share/doc -.if defined(MAKE_DVD) - @mkdir -p ${CD_DVD1}/usr/share/doc + @echo "CD_VOLUME = 3" >> ${CD_DOCS}/cdrom.inf .endif - @for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \ - if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \ - -d /usr/doc/$$i ]; then \ - mv ${CD_LIVEFS}/usr/share/doc/$$i \ - ${CD_DOCS}/usr/share/doc; \ - fi \ - done -.if defined(MAKE_DVD) - @cd ${CD_DOCS}/usr/share/doc && find . -print | \ - cpio -dumpl ${CD_DVD1}/usr/share/doc -.endif -.endif touch ${.TARGET} # @@ -1082,6 +1064,11 @@ .if exists(${CD_PACKAGE_TREE}/disc2) CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2 .endif +# scripts/package-trees.sh names all discs according to the "discX" +# scheme where X is the number of the disc +.if exists(${CD_PACKAGE_TREE}/disc3) +CD_DOCS_PKGS= ${CD_PACKAGE_TREE}/disc3 +.endif .if exists(${CD_PACKAGE_TREE}/dvd1) CD_DVD1_PKGS= ${CD_PACKAGE_TREE}/dvd1 .endif @@ -1113,7 +1100,8 @@ .if !defined(NODOC) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ FreeBSD_Documentation \ - ${CD}/${BUILDNAME}-${TARGET}-docs.iso ${CD_DOCS} + ${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \ + ${CD_DOCS_PKGS} .endif .if defined(SEPARATE_LIVEFS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ @@ -1139,9 +1127,6 @@ make all install clean BATCH=yes WITHOUT_X11=yes JADETEX=no \ WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \ done - @cd /usr/doc && make all install 'FORMATS=html html-split txt' \ - INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc \ - URLS_ABSOLUTE=YES touch ${.TARGET} # ==== //depot/projects/scottl-camlock/src/release/scripts/package-split.py#3 (text+ko) ==== @@ -7,7 +7,7 @@ # # Usage: package-split.py <INDEX> <master INDEX> # -# $FreeBSD: src/release/scripts/package-split.py,v 1.17 2007/11/07 09:11:45 kris Exp $ +# $FreeBSD: src/release/scripts/package-split.py,v 1.18 2009/06/28 08:59:46 blackend Exp $ import os import sys @@ -86,11 +86,34 @@ 'ports-mgmt/portaudit']) return pkgs +def docs_packages(): + pkgs = ['misc/freebsd-doc-bn', + 'misc/freebsd-doc-da', + 'misc/freebsd-doc-de', + 'misc/freebsd-doc-el', + 'misc/freebsd-doc-en', + 'misc/freebsd-doc-es', + 'misc/freebsd-doc-fr', + 'misc/freebsd-doc-hu', + 'misc/freebsd-doc-it', + 'misc/freebsd-doc-ja', + 'misc/freebsd-doc-mn', + 'misc/freebsd-doc-nl', + 'misc/freebsd-doc-pl', + 'misc/freebsd-doc-pt', + 'misc/freebsd-doc-ru', + 'misc/freebsd-doc-sr', + 'misc/freebsd-doc-tr', + 'misc/freebsd-doc-zh_cn', + 'misc/freebsd-doc-zh_tw'] + return pkgs + # The list of desired packages def desired_packages(): disc1 = disc1_packages() disc2 = disc2_packages() - return [disc1, disc2] + docs = docs_packages() + return [disc1, disc2, docs] # Suck the entire INDEX file into a two different dictionaries. The first # dictionary maps port names (origins) to package names. The second ==== //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw.8#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.230 2009/06/26 05:09:00 maxim Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.231 2009/06/26 19:49:06 oleg Exp $ .\" .Dd June 24, 2009 .Dt IPFW 8 @@ -1944,13 +1944,18 @@ The default value is 0, meaning no delay. .Pp .It Cm burst Ar size -If the data rate exceeds the pipe bandwith limit -(and pipe was idle long enough), +If the data to be sent exceeds the pipe's bandwidth limit +(and the pipe was previously idle), up to .Ar size -bytes of data is allowed to bypass the +bytes of data are allowed to bypass the .Nm dummynet -scheduler (i.e. it will be sent without shaping), then transmission rate -will not exceed pipe bandwidth. Effective burst size calculated as follows: +scheduler, and will be sent as fast as the physical link allows. +Any additional data will be transmitted at the rate specified +by the +.Nm pipe +bandwidth. +The burst size depends on how long the pipe has been idle; +the effective burst size is calculated as follows: MAX( .Ar size , ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/sys_machdep.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.91 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.93 2009/06/27 15:03:50 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -87,7 +87,7 @@ * XXXKIB check that the BSM generation code knows to encode * the op argument. */ - AUDIT_ARG(cmd, uap->op); + AUDIT_ARG_CMD(uap->op); if (uap_space == UIO_USERSPACE) { error = copyin(uap->parms, &la, sizeof(struct i386_ldt_args)); if (error != 0) @@ -170,7 +170,7 @@ * XXXKIB check that the BSM generation code knows to encode * the op argument. */ - AUDIT_ARG(cmd, uap->op); + AUDIT_ARG_CMD(uap->op); switch (uap->op) { case I386_GET_IOPERM: case I386_SET_IOPERM: ==== //depot/projects/scottl-camlock/src/sys/amd64/include/vm.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/vm.h,v 1.1 2009/06/26 04:47:43 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vm.h,v 1.2 2009/06/26 16:22:24 alc Exp $ */ #ifndef _MACHINE_VM_H_ @@ -42,4 +42,4 @@ #define VM_CACHE_DEFAULT VM_CACHE_WRITE_BACK -#endif /* !_MACHINE_PMAP_H_ */ +#endif /* !_MACHINE_VM_H_ */ ==== //depot/projects/scottl-camlock/src/sys/arm/include/vm.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vm.h,v 1.1 2009/06/26 04:47:43 alc Exp $ + * $FreeBSD: src/sys/arm/include/vm.h,v 1.2 2009/06/26 16:22:24 alc Exp $ */ #ifndef _MACHINE_VM_H_ @@ -32,4 +32,4 @@ /* Cache control is not (yet) implemented. */ #define VM_CACHE_DEFAULT 0 -#endif /* !_MACHINE_PMAP_H_ */ +#endif /* !_MACHINE_VM_H_ */ ==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.91 2009/06/24 21:10:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.92 2009/06/27 13:58:44 rwatson Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -2924,7 +2924,7 @@ struct uio *auio; int error; - AUDIT_ARG(fflags, uap->flags); + AUDIT_ARG_FFLAGS(uap->flags); /* * Filter out MNT_ROOTFS. We do not want clients of nmount() in ==== //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.66 2008/10/19 10:02:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.67 2009/06/27 13:58:44 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -546,8 +546,8 @@ ksiginfo_t ksi; int error; - AUDIT_ARG(signum, signum); - AUDIT_ARG(pid, pid); + AUDIT_ARG_SIGNUM(signum); + AUDIT_ARG_PID(pid); /* * Allow signal 0 as a means to check for privileges @@ -563,7 +563,7 @@ return (ESRCH); } - AUDIT_ARG(process, p); + AUDIT_ARG_PROCESS(p); error = p_cansignal(td, p, signum); if (error) goto out; ==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1548 2009/06/23 06:11:04 zec Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1549 2009/06/26 17:50:52 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -301,6 +301,9 @@ # Old tty interface. options COMPAT_43TTY +# Note that as a general rule, COMPAT_FREEBSD<n> depends on +# COMPAT_FREEBSD<n+1>, COMPAT_FREEBSD<n+2>, etc. + # Enable FreeBSD4 compatibility syscalls options COMPAT_FREEBSD4 ==== //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.5 2009/06/26 11:45:06 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.6 2009/06/29 05:12:21 yongari Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -620,6 +620,14 @@ ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWCSUM; ifp->if_capenable = ifp->if_capabilities; + /* + * Even though controllers supported by ale(3) have Rx checksum + * offload bug the workaround for fragmented frames seemed to + * work so far. However it seems Rx checksum offload does not + * work under certain conditions. So disable Rx checksum offload + * until I find more clue about it but allow users to override it. + */ + ifp->if_capenable &= ~IFCAP_RXCSUM; /* Tell the upper layer(s) we support long frames. */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); ==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.10 2009/05/19 17:30:13 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.11 2009/06/27 20:06:56 sam Exp $ */ #include "opt_ah.h" @@ -503,6 +503,8 @@ case HAL_CAP_INTRMASK: /* mask of supported interrupts */ *result = pCap->halIntrMask; return HAL_OK; + case HAL_CAP_BSSIDMATCH: /* hardware has disable bssid match */ + return pCap->halBssidMatchSupport ? HAL_OK : HAL_ENOTSUPP; default: return HAL_EINVAL; } ==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.h#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.11 2009/05/19 17:54:32 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.12 2009/06/27 20:06:56 sam Exp $ */ #ifndef _ATH_AH_H_ @@ -110,6 +110,7 @@ HAL_CAP_BB_HANG = 35, /* can baseband hang */ HAL_CAP_MAC_HANG = 36, /* can MAC hang */ HAL_CAP_INTRMASK = 37, /* bitmask of supported interrupts */ + HAL_CAP_BSSIDMATCH = 38, /* hardware has disable bssid match */ } HAL_CAPABILITY_TYPE; /* @@ -296,6 +297,7 @@ HAL_RX_FILTER_PHYERR = 0x00000100, /* Allow phy errors */ HAL_RX_FILTER_PHYRADAR = 0x00000200, /* Allow phy radar errors */ HAL_RX_FILTER_COMPBAR = 0x00000400, /* Allow compressed BAR */ + HAL_RX_FILTER_BSSID = 0x00000800, /* Disable BSSID match */ } HAL_RX_FILTER; typedef enum { ==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_internal.h#4 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.12 2009/05/19 17:30:13 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.13 2009/06/27 20:06:56 sam Exp $ */ #ifndef _ATH_AH_INTERAL_H_ #define _ATH_AH_INTERAL_H_ @@ -193,7 +193,8 @@ halExtChanDfsSupport : 1, halForcePpmSupport : 1, halEnhancedPmSupport : 1, - halMbssidAggrSupport : 1; + halMbssidAggrSupport : 1, + halBssidMatchSupport : 1; uint32_t halWirelessModes; uint16_t halTotalQueues; uint16_t halKeyCacheSize; ==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c,v 1.7 2009/05/19 17:53:53 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c,v 1.8 2009/06/27 20:06:56 sam Exp $ */ #include "opt_ah.h" @@ -833,11 +833,15 @@ ahpriv->ah_rxornIsFatal = (AH_PRIVATE(ah)->ah_macVersion < AR_SREV_VERSION_VENICE); - /* h/w phy counters first appeared in Hainan */ - pCap->halHwPhyCounterSupport = - (AH_PRIVATE(ah)->ah_macVersion == AR_SREV_VERSION_VENICE && + /* enable features that first appeared in Hainan */ + if ((AH_PRIVATE(ah)->ah_macVersion == AR_SREV_VERSION_VENICE && AH_PRIVATE(ah)->ah_macRev == AR_SREV_HAINAN) || - AH_PRIVATE(ah)->ah_macVersion > AR_SREV_VERSION_VENICE; + AH_PRIVATE(ah)->ah_macVersion > AR_SREV_VERSION_VENICE) { + /* h/w phy counters */ + pCap->halHwPhyCounterSupport = AH_TRUE; + /* bssid match disable */ + pCap->halBssidMatchSupport = AH_TRUE; + } pCap->halTstampPrecision = 15; pCap->halIntrMask = HAL_INT_COMMON ==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5212_recv.c,v 1.4 2008/11/10 04:08:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c,v 1.2 2009/06/27 20:06:56 sam Exp $ */ #include "opt_ah.h" @@ -163,6 +163,9 @@ bits |= HAL_RX_FILTER_PHYRADAR; if (phybits & (AR_PHY_ERR_OFDM_TIMING|AR_PHY_ERR_CCK_TIMING)) bits |= HAL_RX_FILTER_PHYERR; + if (AH_PRIVATE(ah)->ah_caps.halBssidMatchSupport && + (OS_REG_READ(ah, AR_MISC_MODE) & AR_MISC_MODE_BSSID_MATCH_FORCE)) + bits |= HAL_RX_FILTER_BSSID; return bits; } @@ -175,7 +178,8 @@ uint32_t phybits; OS_REG_WRITE(ah, AR_RX_FILTER, - bits &~ (HAL_RX_FILTER_PHYRADAR|HAL_RX_FILTER_PHYERR)); + bits &~ (HAL_RX_FILTER_PHYRADAR|HAL_RX_FILTER_PHYERR| + HAL_RX_FILTER_BSSID)); phybits = 0; if (bits & HAL_RX_FILTER_PHYRADAR) phybits |= AR_PHY_ERR_RADAR; @@ -189,6 +193,14 @@ OS_REG_WRITE(ah, AR_RXCFG, OS_REG_READ(ah, AR_RXCFG) &~ AR_RXCFG_ZLFDMA); } + if (AH_PRIVATE(ah)->ah_caps.halBssidMatchSupport) { + uint32_t miscbits = OS_REG_READ(ah, AR_MISC_MODE); + if (bits & HAL_RX_FILTER_BSSID) + miscbits |= AR_MISC_MODE_BSSID_MATCH_FORCE; + else + miscbits &= ~AR_MISC_MODE_BSSID_MATCH_FORCE; + OS_REG_WRITE(ah, AR_MISC_MODE, miscbits); + } } /* ==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c,v 1.9 2009/05/19 17:30:13 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c,v 1.10 2009/06/27 20:06:56 sam Exp $ */ #include "opt_ah.h" @@ -811,6 +811,7 @@ pCap->halMbssidAggrSupport = AH_TRUE; pCap->halForcePpmSupport = AH_TRUE; pCap->halEnhancedPmSupport = AH_TRUE; + pCap->halBssidMatchSupport = AH_TRUE; if (ath_hal_eepromGetFlag(ah, AR_EEP_RFKILL) && ath_hal_eepromGet(ah, AR_EEP_RFSILENT, &ahpriv->ah_rfsilent) == HAL_OK) { ==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.8 2009/05/08 00:23:00 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c,v 1.10 2009/06/28 11:32:52 phk Exp $ */ #include "opt_ah.h" ==== //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#18 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.87 2009/05/20 20:00:40 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.88 2009/06/27 20:06:56 sam Exp $ */ /* @@ -590,6 +590,8 @@ (ath_hal_getcapability(_ah, HAL_CAP_FASTFRAME, 0, NULL) == HAL_OK) #define ath_hal_hasbssidmask(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_BSSIDMASK, 0, NULL) == HAL_OK) +#define ath_hal_hasbssidmatch(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_BSSIDMATCH, 0, NULL) == HAL_OK) #define ath_hal_hastsfadjust(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_TSF_ADJUST, 0, NULL) == HAL_OK) #define ath_hal_gettsfadjust(_ah) \ ==== //depot/projects/scottl-camlock/src/sys/dev/cpuctl/cpuctl.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cpuctl/cpuctl.c,v 1.3 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cpuctl/cpuctl.c,v 1.4 2009/06/26 22:13:15 stas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -222,14 +222,17 @@ * Explicitly clear cpuid data to avoid returning stale * info */ - data->data = 0; DPRINTF("[cpuctl,%d]: operating on MSR %#0x for %d cpu\n", __LINE__, data->msr, cpu); oldcpu = td->td_oncpu; is_bound = cpu_sched_is_bound(td); set_cpu(cpu, td); - ret = cmd == CPUCTL_RDMSR ? rdmsr_safe(data->msr, &data->data) : - wrmsr_safe(data->msr, data->data); + if (cmd == CPUCTL_RDMSR) { + data->data = 0; + ret = rdmsr_safe(data->msr, &data->data); + } else { + ret = wrmsr_safe(data->msr, data->data); + } restore_cpu(oldcpu, is_bound, td); return (ret); } @@ -368,7 +371,7 @@ /* * Perform update. */ - wrmsr_safe(MSR_K8_UCODE_UPDATE, (uintptr_t)args->data); + wrmsr_safe(MSR_K8_UCODE_UPDATE, (uintptr_t)ptr); /* * Serialize instruction flow. ==== //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#8 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.46 2009/06/19 23:34:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.47 2009/06/26 19:04:08 rwatson Exp $ ***************************************************************************/ @@ -467,7 +467,7 @@ struct ifmultiaddr *ifma; int i = 0; - IF_ADDR_LOCK(ifp); + if_maddr_rlock(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; @@ -477,8 +477,7 @@ } i++; } - IF_ADDR_UNLOCK(ifp); - + if_maddr_runlock(ifp); rm->idx++; return (macaddr); ==== //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#20 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906290841.n5T8fU2x076346>