Date: Mon, 27 Oct 2008 19:43:24 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 152044 for review Message-ID: <200810271943.m9RJhOcJ058564@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152044 Change 152044 by sam@sam_ebb on 2008/10/27 19:43:03 IFC @ 152043 Affected files ... .. //depot/projects/vap/bin/cp/utils.c#6 integrate .. //depot/projects/vap/etc/Makefile#9 integrate .. //depot/projects/vap/etc/devd.conf#6 integrate .. //depot/projects/vap/etc/rc.subr#7 integrate .. //depot/projects/vap/etc/remote#4 integrate .. //depot/projects/vap/sys/arm/at91/at91.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/vap/sys/dev/ath/ah_osdep.c#6 integrate .. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#12 integrate .. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#15 integrate .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#16 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#118 integrate .. //depot/projects/vap/sys/dev/ath/if_athrate.h#11 integrate .. //depot/projects/vap/sys/dev/ath/if_athvar.h#35 integrate .. //depot/projects/vap/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#26 integrate .. //depot/projects/vap/sys/dev/ofw/ofw_console.c#9 integrate .. //depot/projects/vap/sys/dev/ral/rt2560.c#42 integrate .. //depot/projects/vap/sys/dev/ral/rt2661.c#42 integrate .. //depot/projects/vap/sys/dev/usb/if_zyd.c#30 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#32 integrate .. //depot/projects/vap/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/vap/sys/kern/subr_param.c#8 integrate .. //depot/projects/vap/sys/modules/mac_bsdextended/Makefile#3 integrate .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#21 integrate .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#23 integrate .. //depot/projects/vap/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/vap/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#9 integrate .. //depot/projects/vap/sys/netinet6/ip6_var.h#10 integrate .. //depot/projects/vap/sys/pc98/pc98/pc98_machdep.c#6 integrate .. //depot/projects/vap/sys/pc98/pc98/pc98_machdep.h#5 integrate .. //depot/projects/vap/sys/powerpc/aim/locore.S#7 integrate .. //depot/projects/vap/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/vap/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/vap/sys/powerpc/include/cpu.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/profile.h#5 integrate .. //depot/projects/vap/sys/powerpc/powermac/ata_kauai.c#9 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#10 integrate .. //depot/projects/vap/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#10 integrate .. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#12 integrate .. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate .. //depot/projects/vap/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch .. //depot/projects/vap/sys/security/mac_bsdextended/ugidfw_system.c#1 branch .. //depot/projects/vap/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch .. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#12 integrate .. //depot/projects/vap/sys/security/mac_test/mac_test.c#12 integrate .. //depot/projects/vap/sys/sys/cons.h#6 integrate .. //depot/projects/vap/tools/tools/ath/athdebug/athdebug.c#5 integrate .. //depot/projects/vap/tools/tools/ath/athstats/Makefile#5 integrate .. //depot/projects/vap/tools/tools/ath/athstats/athstats.c#7 integrate .. //depot/projects/vap/tools/tools/ath/athstats/main.c#6 integrate .. //depot/projects/vap/usr.sbin/Makefile#17 integrate Differences ... ==== //depot/projects/vap/bin/cp/utils.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.56 2008/10/27 15:21:15 dds Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -137,41 +137,39 @@ * Mmap and write if less than 8M (the limit is so we don't totally * trash memory on big files. This is really a minor hack, but it * wins some CPU back. + * Some filesystems, such as smbnetfs, don't support mmap, + * so this is a best-effort attempt. */ #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED if (S_ISREG(fs->st_mode) && fs->st_size > 0 && - fs->st_size <= 8 * 1048576) { - if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ, - MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) { + fs->st_size <= 8 * 1024 * 1024 && + (p = mmap(NULL, (size_t)fs->st_size, PROT_READ, + MAP_SHARED, from_fd, (off_t)0)) != MAP_FAILED) { + wtotal = 0; + for (bufp = p, wresid = fs->st_size; ; + bufp += wcount, wresid -= (size_t)wcount) { + wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; + wtotal += wcount; + if (info) { + info = 0; + (void)fprintf(stderr, + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); + } + if (wcount >= (ssize_t)wresid) + break; + } + if (wcount != (ssize_t)wresid) { + warn("%s", to.p_path); + rval = 1; + } + /* Some systems don't unmap on close(2). */ + if (munmap(p, fs->st_size) < 0) { warn("%s", entp->fts_path); rval = 1; - } else { - wtotal = 0; - for (bufp = p, wresid = fs->st_size; ; - bufp += wcount, wresid -= (size_t)wcount) { - wcount = write(to_fd, bufp, wresid); - if (wcount <= 0) - break; - wtotal += wcount; - if (info) { - info = 0; - (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - } - if (wcount >= (ssize_t)wresid) - break; - } - if (wcount != (ssize_t)wresid) { - warn("%s", to.p_path); - rval = 1; - } - /* Some systems don't unmap on close(2). */ - if (munmap(p, fs->st_size) < 0) { - warn("%s", entp->fts_path); - rval = 1; - } } } else #endif ==== //depot/projects/vap/etc/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.371 2008/10/08 13:28:02 des Exp $ +# $FreeBSD: src/etc/Makefile,v 1.372 2008/10/27 16:13:28 sam Exp $ .include <bsd.own.mk> @@ -8,7 +8,7 @@ .endif BIN1= auth.conf \ - crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + crontab devd.conf devfs.conf \ ddb.conf dhclient.conf disktab fbtab \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv \ @@ -84,6 +84,10 @@ BIN1+= pf.os .endif +.if ${MK_TCSH} != "no" +BIN1+= csh.cshrc csh.login csh.logout +.endif + .if ${MK_WIRELESS} != "no" BIN1+= regdomain.xml .endif @@ -148,9 +152,12 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ - pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ - ${DESTDIR}/etc/master.passwd + master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; +.if ${MK_TCSH} == "no" + sed -i "" -e 's;/bin/csh;;' ${DESTDIR}/etc/master.passwd +.endif + pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ + ${DESTDIR}/etc/master.passwd .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif @@ -195,14 +202,18 @@ .endif cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + dot.profile ${DESTDIR}/root/.profile; \ + rm -f ${DESTDIR}/.profile; \ + ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile +.if ${MK_TCSH} != "no" + cd ${.CURDIR}/root; \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - dot.profile ${DESTDIR}/root/.profile; \ - rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \ - ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \ - ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile + rm -f ${DESTDIR}/.cshrc; \ + ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc +.endif cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree .if ${MK_PPP} != "no" ==== //depot/projects/vap/etc/devd.conf#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.42 2008/06/27 12:04:36 rpaulo Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.43 2008/10/27 16:20:40 thompsa Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -256,6 +256,7 @@ }; # The next blocks enable volume hotkeys that can be found on the Asus EeePC +# The four keys above the keyboard notify 0x1a through to 0x1d respectively notify 0 { match "system" "ACPI"; match "subsystem" "ASUS-Eee"; ==== //depot/projects/vap/etc/rc.subr#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.86 2008/06/23 05:09:10 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.87 2008/10/27 01:05:09 thompsa Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -913,6 +913,7 @@ else ( trap "echo Script $_file interrupted; kill -QUIT $$" 3 trap "echo Script $_file interrupted; exit 1" 2 + trap "echo Script $_file running" 29 set $_arg; . $_file ) fi fi ==== //depot/projects/vap/etc/remote#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.18 2008/07/21 22:38:00 marcel Exp $ +# $FreeBSD: src/etc/remote,v 1.19 2008/10/27 17:19:14 thompsa Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -66,3 +66,11 @@ uart5|com6:dv=/dev/cuau5:br#9600:pa=none: uart6|com7:dv=/dev/cuau6:br#9600:pa=none: uart7|com8:dv=/dev/cuau7:br#9600:pa=none: +ucom1:dv=/dev/cuaU0:br#9600:pa=none: +ucom2:dv=/dev/cuaU1:br#9600:pa=none: +ucom3:dv=/dev/cuaU2:br#9600:pa=none: +ucom4:dv=/dev/cuaU3:br#9600:pa=none: +ucom5:dv=/dev/cuaU4:br#9600:pa=none: +ucom6:dv=/dev/cuaU5:br#9600:pa=none: +ucom7:dv=/dev/cuaU6:br#9600:pa=none: +ucom8:dv=/dev/cuaU7:br#9600:pa=none: ==== //depot/projects/vap/sys/arm/at91/at91.c#7 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.20 2008/10/26 22:53:59 stas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -168,6 +168,42 @@ generic_armv4_bs_c_2, NULL, NULL, + + /* read (single) stream */ + generic_bs_r_1, + generic_armv4_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple stream */ + generic_bs_rm_1, + generic_armv4_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region stream */ + generic_bs_rr_1, + generic_armv4_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) stream */ + generic_bs_w_1, + generic_armv4_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple stream */ + generic_bs_wm_1, + generic_armv4_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region stream */ + NULL, + generic_armv4_bs_wr_2, + generic_bs_wr_4, + NULL, }; static int @@ -534,8 +570,10 @@ case SYS_RES_MEMORY: rle->res = rman_reserve_resource(&sc->sc_mem_rman, start, end, count, flags, child); - rman_set_bustag(rle->res, &at91_bs_tag); - rman_set_bushandle(rle->res, start); + if (rle->res != NULL) { + rman_set_bustag(rle->res, &at91_bs_tag); + rman_set_bushandle(rle->res, start); + } break; } if (rle->res) { ==== //depot/projects/vap/sys/dev/ata/ata-queue.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.73 2008/04/21 10:35:19 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.74 2008/10/27 09:26:24 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -503,7 +503,8 @@ request->flags |= ATA_R_TIMEOUT; mtx_unlock(&ch->state_mtx); ATA_LOCKING(ch->dev, ATA_LF_UNLOCK); - ch->dma.unload(request); + if (ch->dma.unload) + ch->dma.unload(request); ata_finish(request); } else { ==== //depot/projects/vap/sys/dev/ath/ah_osdep.c#6 (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/ah_osdep.c,v 1.4 2008/04/20 20:35:35 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.5 2008/10/27 18:30:33 sam Exp $ */ #include "opt_ah.h" ==== //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#12 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.15 2008/04/20 20:35:36 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.17 2008/10/27 17:03:24 sam Exp $"); /* * AMRR rate control. See: ==== //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.16 2008/04/20 20:35:36 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.18 2008/10/27 17:03:24 sam Exp $"); /* * Atsushi Onoe's rate control algorithm. ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.20 2008/04/20 20:35:36 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.24 2008/10/27 18:22:44 sam Exp $"); /* * John Bicket's SampleRate control algorithm. ==== //depot/projects/vap/sys/dev/ath/if_ath.c#118 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.194 2008/10/19 21:34:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.214 2008/10/27 18:30:33 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/vap/sys/dev/ath/if_athrate.h#11 (text+ko) ==== @@ -27,7 +27,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_athrate.h,v 1.7 2008/04/20 20:35:35 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.8 2008/10/27 16:58:06 sam Exp $ */ #ifndef _ATH_RATECTRL_H_ #define _ATH_RATECTRL_H_ ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#35 (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.67 2008/09/21 00:28:54 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.73 2008/10/27 18:30:33 sam Exp $ */ /* ==== //depot/projects/vap/sys/dev/cfe/cfe_console.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cfe/cfe_console.c,v 1.4 2008/09/28 03:33:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cfe/cfe_console.c,v 1.5 2008/10/27 11:45:31 ed Exp $"); #include "opt_comconsole.h" @@ -173,8 +173,7 @@ cfe_cninit(struct consdev *cp) { - sprintf(cp->cn_name, "cfecons"); - cp->cn_tp = cfe_tp; + strcpy(cp->cn_name, "cfecons"); } static void ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#26 (text+kox) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.8 2008/10/24 21:21:43 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.9 2008/10/27 16:46:50 sam Exp $"); #include <sys/param.h> #include <sys/sockio.h> ==== //depot/projects/vap/sys/dev/ofw/ofw_console.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.40 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.41 2008/10/27 11:45:31 ed Exp $"); #include "opt_comconsole.h" #include "opt_ofw.h" @@ -60,7 +60,6 @@ .tsw_outwakeup = ofwtty_outwakeup, }; -static struct tty *ofw_tp = NULL; static int polltime; static struct callout_handle ofw_timeouthandle = CALLOUT_HANDLE_INITIALIZER(&ofw_timeouthandle); @@ -186,8 +185,7 @@ { /* XXX: This is the alias, but that should be good enough */ - sprintf(cp->cn_name, "ofwcons"); - cp->cn_tp = ofw_tp; + strcpy(cp->cn_name, "ofwcons"); } static void ==== //depot/projects/vap/sys/dev/ral/rt2560.c#42 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.26 2008/06/07 18:38:02 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.27 2008/10/27 16:46:50 sam Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.26 2008/06/07 18:38:02 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.27 2008/10/27 16:46:50 sam Exp $"); /*- * Ralink Technology RT2560 chipset driver ==== //depot/projects/vap/sys/dev/ral/rt2661.c#42 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.26 2008/06/07 18:38:02 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.27 2008/10/27 16:46:50 sam Exp $ */ /*- * Copyright (c) 2006 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.26 2008/06/07 18:38:02 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.27 2008/10/27 16:46:50 sam Exp $"); /*- * Ralink Technology RT2561, RT2561S and RT2661 chipset driver ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#30 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.22 2008/09/19 07:40:30 weongyo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.23 2008/10/27 16:46:50 sam Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#32 (text+ko) ==== @@ -19,7 +19,7 @@ #define VERSION "20071127" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.17 2008/08/24 22:42:39 benjsc Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.18 2008/10/27 16:46:50 sam Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. ==== //depot/projects/vap/sys/dev/xen/console/console.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.5 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.6 2008/10/27 11:45:31 ed Exp $"); #include <sys/param.h> #include <sys/module.h> @@ -107,7 +107,6 @@ xccnprobe(struct consdev *cp) { cp->cn_pri = CN_REMOTE; - cp->cn_tp = xccons; sprintf(cp->cn_name, "%s0", driver_name); } ==== //depot/projects/vap/sys/kern/subr_param.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.76 2008/07/04 19:36:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.79 2008/10/27 08:09:05 sobomax Exp $"); #include "opt_param.h" #include "opt_maxusers.h" @@ -57,6 +57,13 @@ # else # define HZ 100 # endif +# ifndef HZ_VM +# define HZ_VM 10 +# endif +#else +# ifndef HZ_VM +# define HZ_VM HZ +# endif #endif #define NPROC (20 + 16 * maxusers) #ifndef NBUF @@ -111,6 +118,30 @@ */ struct buf *swbuf; +static const char *const vm_pnames[] = { + "VMware Virtual Platform", /* VMWare VM */ + "Virtual Machine", /* Microsoft VirtualPC */ + "VirtualBox", /* Sun xVM VirtualBox */ + "Parallels Virtual Platform", /* Parallels VM */ + NULL +}; + +static int +detect_virtual(void) +{ + char *sysenv; + int i; + + sysenv = getenv("smbios.system.product"); + if (sysenv != NULL) { + for (i = 0; vm_pnames[i] != NULL; i++) { + if (strcmp(sysenv, vm_pnames[i]) == 0) + return 1; + } + } + return 0; +} + /* * Boot time overrides that are not scaled against main memory */ @@ -118,8 +149,15 @@ init_param1(void) { - hz = HZ; + hz = -1; TUNABLE_INT_FETCH("kern.hz", &hz); + if (hz == -1) { + if (detect_virtual()) { + hz = HZ_VM; + } else { + hz = HZ; + } + } tick = 1000000 / hz; #ifdef VM_SWZONE_SIZE_MAX ==== //depot/projects/vap/sys/modules/mac_bsdextended/Makefile#3 (text+ko) ==== @@ -1,9 +1,12 @@ -# $FreeBSD: src/sys/modules/mac_bsdextended/Makefile,v 1.1 2002/08/01 17:41:26 rwatson Exp $ +# $FreeBSD: src/sys/modules/mac_bsdextended/Makefile,v 1.2 2008/10/27 12:09:15 rwatson Exp $ .PATH: ${.CURDIR}/../../security/mac_bsdextended KMOD= mac_bsdextended SRCS= vnode_if.h \ - mac_bsdextended.c + mac_bsdextended.h \ + mac_bsdextended.c \ + ugidfw_system.c \ + ugidfw_vnode.c .include <bsd.kmod.mk> ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ #include <sys/cdefs.h> #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.5 2008/10/25 23:40:33 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.6 2008/10/27 16:46:50 sam Exp $"); #endif /* ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ #include <sys/cdefs.h> #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_sta.c,v 1.9 2008/10/25 23:23:41 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_sta.c,v 1.10 2008/10/27 16:46:50 sam Exp $"); #endif /* ==== //depot/projects/vap/sys/netinet/sctp_os_bsd.h#9 (text+ko) ==== @@ -28,7 +28,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_os_bsd.h,v 1.40 2008/10/23 15:53:51 des Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_os_bsd.h,v 1.41 2008/10/27 13:54:54 rrs Exp $"); #ifndef __sctp_os_bsd_h__ #define __sctp_os_bsd_h__ /* @@ -61,9 +61,7 @@ #include <sys/random.h> #include <sys/limits.h> #include <sys/queue.h> -#if defined(__FreeBSD__) && __FreeBSD_version >= 800044 #include <sys/vimage.h> -#endif #include <machine/cpu.h> #include <net/if.h> ==== //depot/projects/vap/sys/netinet/sctp_output.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_output.c,v 1.46 2005/03/06 16:04:17 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_output.c,v 1.77 2008/10/18 15:54:25 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_output.c,v 1.79 2008/10/27 14:49:12 rrs Exp $"); #include <netinet/sctp_os.h> #include <sys/proc.h> @@ -11682,7 +11682,12 @@ sp->put_last_out = 0; resv_in_first = sizeof(struct sctp_data_chunk); sp->data = sp->tail_mbuf = NULL; + if (sp->length == 0) { + *error = 0; + goto skip_copy; + } *error = sctp_copy_one(sp, uio, resv_in_first); +skip_copy: if (*error) { sctp_free_a_strmoq(stcb, sp); sp = NULL; @@ -12430,7 +12435,7 @@ goto out_unlocked; } if (user_marks_eor) { - local_add_more = SCTP_BASE_SYSCTL(sctp_add_more_threshold); + local_add_more = min(SCTP_SB_LIMIT_SND(so), SCTP_BASE_SYSCTL(sctp_add_more_threshold)); } else { /*- * For non-eeor the whole message must fit in @@ -12443,14 +12448,21 @@ goto skip_preblock; } if (((max_len <= local_add_more) && - (SCTP_SB_LIMIT_SND(so) > local_add_more)) || + (SCTP_SB_LIMIT_SND(so) >= local_add_more)) || + (max_len == 0) || ((stcb->asoc.chunks_on_out_queue + stcb->asoc.stream_queue_cnt) >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue))) { /* if */ /* No room right now ! */ SOCKBUF_LOCK(&so->so_snd); inqueue_bytes = stcb->asoc.total_output_queue_size - (stcb->asoc.chunks_on_out_queue * sizeof(struct sctp_data_chunk)); - while ((SCTP_SB_LIMIT_SND(so) < (inqueue_bytes + SCTP_BASE_SYSCTL(sctp_add_more_threshold))) || - ((stcb->asoc.stream_queue_cnt + stcb->asoc.chunks_on_out_queue) >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue) /* while */ )) { - + while ((SCTP_SB_LIMIT_SND(so) < (inqueue_bytes + local_add_more)) || + ((stcb->asoc.stream_queue_cnt + stcb->asoc.chunks_on_out_queue) >= SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue)) /* while */ ) { + SCTPDBG(SCTP_DEBUG_OUTPUT1, "pre_block limit:%d <(inq:%d + %d) || (%d+%d > %d)\n", + SCTP_SB_LIMIT_SND(so), + inqueue_bytes, + local_add_more, + stcb->asoc.stream_queue_cnt, + stcb->asoc.chunks_on_out_queue, + SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue)); if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_BLK_LOGGING_ENABLE) { sctp_log_block(SCTP_BLOCK_LOG_INTO_BLKA, so, asoc, sndlen); @@ -13058,7 +13070,7 @@ (void)sctp_med_chunk_output(inp, stcb, &stcb->asoc, &num_out, &reason, 1, &cwnd_full, 1, &now, &now_filled, frag_point, SCTP_SO_LOCKED); } - SCTPDBG(SCTP_DEBUG_OUTPUT1, "USR Send complete qo:%d prw:%d unsent:%d tf:%d cooq:%d toqs:%d err:%d", + SCTPDBG(SCTP_DEBUG_OUTPUT1, "USR Send complete qo:%d prw:%d unsent:%d tf:%d cooq:%d toqs:%d err:%d\n", queue_only, stcb->asoc.peers_rwnd, un_sent, stcb->asoc.total_flight, stcb->asoc.chunks_on_out_queue, stcb->asoc.total_output_queue_size, error); ==== //depot/projects/vap/sys/netinet/sctp_timer.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_timer.c,v 1.29 2005/03/06 16:04:18 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.c,v 1.40 2008/08/28 20:31:24 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.c,v 1.41 2008/10/27 13:53:31 rrs Exp $"); #define _IP_VHL #include <netinet/sctp_os.h> @@ -561,7 +561,8 @@ } } -void +#ifndef INVARIANTS +static void sctp_recover_sent_list(struct sctp_tcb *stcb) { struct sctp_tmit_chunk *chk, *tp2; @@ -604,6 +605,8 @@ } } +#endif + static int sctp_mark_all_for_resend(struct sctp_tcb *stcb, struct sctp_nets *net, @@ -679,7 +682,9 @@ /* Now on to each chunk */ num_mk = cnt_mk = 0; tsnfirst = tsnlast = 0; +#ifndef INVARIANTS start_again: +#endif chk = TAILQ_FIRST(&stcb->asoc.sent_queue); for (; chk != NULL; chk = tp2) { tp2 = TAILQ_NEXT(chk, sctp_next); @@ -693,8 +698,6 @@ recovery_cnt++; #ifdef INVARIANTS panic("last acked >= chk on sent-Q"); - /* to keep compiler happy */ - goto start_again; #else SCTP_PRINTF("Recover attempts a restart cnt:%d\n", recovery_cnt); sctp_recover_sent_list(stcb); ==== //depot/projects/vap/sys/netinet/sctp_timer.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ /* $KAME: sctp_timer.h,v 1.6 2005/03/06 16:04:18 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.h,v 1.9 2008/08/28 20:31:24 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.h,v 1.10 2008/10/27 13:53:31 rrs Exp $"); #ifndef __sctp_timer_h__ #define __sctp_timer_h__ @@ -99,8 +99,6 @@ void sctp_iterator_timer(struct sctp_iterator *it); -void sctp_recover_sent_list(struct sctp_tcb *stcb); - #endif #endif ==== //depot/projects/vap/sys/netinet6/frag6.c#9 (text+ko) ==== @@ -30,7 +30,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.38 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.39 2008/10/26 22:45:18 rwatson Exp $"); + +#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> @@ -56,6 +58,8 @@ #include <netinet/in_systm.h> /* for ECN definitions */ #include <netinet/ip.h> /* for ECN definitions */ +#include <security/mac/mac_framework.h> + /* * Define it to get a correct behavior on per-interface statistics. * You will need to perform an extra routing table lookup, per fragment, @@ -228,7 +232,11 @@ for (q6 = V_ip6q.ip6q_next; q6 != &V_ip6q; q6 = q6->ip6q_next) if (ip6f->ip6f_ident == q6->ip6q_ident && IN6_ARE_ADDR_EQUAL(&ip6->ip6_src, &q6->ip6q_src) && - IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &q6->ip6q_dst)) + IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &q6->ip6q_dst) +#ifdef MAC + && mac_ip6q_match(m, q6) +#endif + ) break; if (q6 == &V_ip6q) { @@ -254,7 +262,13 @@ if (q6 == NULL) goto dropfrag; bzero(q6, sizeof(*q6)); - +#ifdef MAC + if (mac_ip6q_init(q6, M_NOWAIT) != 0) { + free(q6, M_FTABLE); + goto dropfrag; + } + mac_ip6q_create(m, q6); +#endif frag6_insque(q6, &V_ip6q); /* ip6q_nxt will be filled afterwards, from 1st fragment */ @@ -461,6 +475,10 @@ #endif insert: +#ifdef MAC + if (!first_frag) + mac_ip6q_update(m, q6); +#endif /* * Stick new segment in its place; @@ -533,6 +551,9 @@ if ((t = m_split(m, offset, M_DONTWAIT)) == NULL) { frag6_remque(q6); V_frag6_nfrags -= q6->ip6q_nfrag; +#ifdef MAC + mac_ip6q_destroy(q6); +#endif free(q6, M_FTABLE); V_frag6_nfragpackets--; goto dropfrag; @@ -551,6 +572,10 @@ frag6_remque(q6); V_frag6_nfrags -= q6->ip6q_nfrag; +#ifdef MAC + mac_ip6q_reassemble(q6, m); + mac_ip6q_destroy(q6); +#endif free(q6, M_FTABLE); V_frag6_nfragpackets--; @@ -623,6 +648,9 @@ } frag6_remque(q6); V_frag6_nfrags -= q6->ip6q_nfrag; +#ifdef MAC + mac_ip6q_destroy(q6); +#endif free(q6, M_FTABLE); V_frag6_nfragpackets--; } ==== //depot/projects/vap/sys/netinet6/ip6_var.h#10 (text+ko) ==== @@ -58,7 +58,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet6/ip6_var.h,v 1.44 2008/08/16 06:39:18 bz Exp $ + * $FreeBSD: src/sys/netinet6/ip6_var.h,v 1.45 2008/10/26 22:45:18 rwatson Exp $ */ #ifndef _NETINET6_IP6_VAR_H_ @@ -83,6 +83,7 @@ u_char *ip6q_nxtp; #endif int ip6q_nfrag; /* # of fragments */ + struct label *ip6q_label; }; struct ip6asfrag { ==== //depot/projects/vap/sys/pc98/pc98/pc98_machdep.c#6 (text+ko) ==== @@ -28,7 +28,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/sys/pc98/pc98/pc98_machdep.c,v 1.28 2006/08/09 18:25:07 imp Exp $ + * $FreeBSD: src/sys/pc98/pc98/pc98_machdep.c,v 1.29 2008/10/27 08:40:13 kato Exp $ */ #include "opt_pc98.h" @@ -36,15 +36,23 @@ #include <sys/param.h> #include <sys/systm.h> -#include <cam/cam.h> -#include <cam/cam_ccb.h> #include <sys/bio.h> #include <sys/bus.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810271943.m9RJhOcJ058564>