From owner-svn-src-projects@FreeBSD.ORG Tue Oct 13 19:51:31 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA4F41065695; Tue, 13 Oct 2009 19:51:31 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C52FF8FC0A; Tue, 13 Oct 2009 19:51:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9DJpVUJ014802; Tue, 13 Oct 2009 19:51:31 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9DJpVCm014797; Tue, 13 Oct 2009 19:51:31 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200910131951.n9DJpVCm014797@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 13 Oct 2009 19:51:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198046 - in projects/tcp_cc_8.x: . cddl/compat/opensolaris cddl/contrib/opensolaris cddl/lib/libnvpair contrib/bind9 contrib/bzip2 contrib/cpio contrib/csup contrib/ee contrib/file con... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2009 19:51:31 -0000 Author: lstewart Date: Tue Oct 13 19:51:31 2009 New Revision: 198046 URL: http://svn.freebsd.org/changeset/base/198046 Log: Merge r198022 from projects/tcp_cc_head: Catch up with vimage changes. Modified: projects/tcp_cc_8.x/ (props changed) projects/tcp_cc_8.x/ObsoleteFiles.inc (props changed) projects/tcp_cc_8.x/UPDATING (props changed) projects/tcp_cc_8.x/cddl/compat/opensolaris/ (props changed) projects/tcp_cc_8.x/cddl/contrib/opensolaris/ (props changed) projects/tcp_cc_8.x/cddl/lib/libnvpair/ (props changed) projects/tcp_cc_8.x/contrib/bind9/ (props changed) projects/tcp_cc_8.x/contrib/bzip2/ (props changed) projects/tcp_cc_8.x/contrib/cpio/ (props changed) projects/tcp_cc_8.x/contrib/csup/ (props changed) projects/tcp_cc_8.x/contrib/ee/ (props changed) projects/tcp_cc_8.x/contrib/file/ (props changed) projects/tcp_cc_8.x/contrib/gdb/ (props changed) projects/tcp_cc_8.x/contrib/gdtoa/ (props changed) projects/tcp_cc_8.x/contrib/less/ (props changed) projects/tcp_cc_8.x/contrib/libpcap/ (props changed) projects/tcp_cc_8.x/contrib/ncurses/ (props changed) projects/tcp_cc_8.x/contrib/netcat/ (props changed) projects/tcp_cc_8.x/contrib/ntp/ (props changed) projects/tcp_cc_8.x/contrib/openbsm/ (props changed) projects/tcp_cc_8.x/contrib/openpam/ (props changed) projects/tcp_cc_8.x/contrib/pf/ (props changed) projects/tcp_cc_8.x/contrib/sendmail/ (props changed) projects/tcp_cc_8.x/contrib/tcpdump/ (props changed) projects/tcp_cc_8.x/contrib/tcsh/ (props changed) projects/tcp_cc_8.x/contrib/top/ (props changed) projects/tcp_cc_8.x/contrib/top/install-sh (props changed) projects/tcp_cc_8.x/contrib/traceroute/ (props changed) projects/tcp_cc_8.x/contrib/wpa/ (props changed) projects/tcp_cc_8.x/crypto/openssh/ (props changed) projects/tcp_cc_8.x/crypto/openssl/ (props changed) projects/tcp_cc_8.x/etc/ (props changed) projects/tcp_cc_8.x/gnu/usr.bin/patch/ (props changed) projects/tcp_cc_8.x/include/ (props changed) projects/tcp_cc_8.x/lib/libarchive/ (props changed) projects/tcp_cc_8.x/lib/libc/ (props changed) projects/tcp_cc_8.x/lib/libc/gen/ (props changed) projects/tcp_cc_8.x/lib/libc/stdio/asprintf.c (props changed) projects/tcp_cc_8.x/lib/libc/stdtime/ (props changed) projects/tcp_cc_8.x/lib/libc/string/ffsll.c (props changed) projects/tcp_cc_8.x/lib/libc/string/flsll.c (props changed) projects/tcp_cc_8.x/lib/libc/string/wcpcpy.c (props changed) projects/tcp_cc_8.x/lib/libc/string/wcpncpy.c (props changed) projects/tcp_cc_8.x/lib/libdevinfo/ (props changed) projects/tcp_cc_8.x/lib/libdisk/ (props changed) projects/tcp_cc_8.x/lib/libkvm/ (props changed) projects/tcp_cc_8.x/lib/libthr/ (props changed) projects/tcp_cc_8.x/lib/libusb/ (props changed) projects/tcp_cc_8.x/lib/libusb/libusb20.3 (props changed) projects/tcp_cc_8.x/lib/libusb/usb.h (props changed) projects/tcp_cc_8.x/lib/libutil/ (props changed) projects/tcp_cc_8.x/release/ (props changed) projects/tcp_cc_8.x/release/doc/ (props changed) projects/tcp_cc_8.x/release/doc/en_US.ISO8859-1/hardware/ (props changed) projects/tcp_cc_8.x/sbin/ (props changed) projects/tcp_cc_8.x/sbin/bsdlabel/ (props changed) projects/tcp_cc_8.x/sbin/camcontrol/ (props changed) projects/tcp_cc_8.x/sbin/geom/ (props changed) projects/tcp_cc_8.x/sbin/ifconfig/ (props changed) projects/tcp_cc_8.x/sbin/ipfw/ (props changed) projects/tcp_cc_8.x/sbin/mksnap_ffs/ (props changed) projects/tcp_cc_8.x/sbin/mount/ (props changed) projects/tcp_cc_8.x/sbin/umount/ (props changed) projects/tcp_cc_8.x/share/man/man4/ (props changed) projects/tcp_cc_8.x/share/man/man5/ (props changed) projects/tcp_cc_8.x/share/man/man7/ (props changed) projects/tcp_cc_8.x/share/man/man9/ (props changed) projects/tcp_cc_8.x/share/timedef/ (props changed) projects/tcp_cc_8.x/share/zoneinfo/ (props changed) projects/tcp_cc_8.x/sys/ (props changed) projects/tcp_cc_8.x/sys/amd64/include/xen/ (props changed) projects/tcp_cc_8.x/sys/cddl/contrib/opensolaris/ (props changed) projects/tcp_cc_8.x/sys/contrib/dev/acpica/ (props changed) projects/tcp_cc_8.x/sys/contrib/pf/ (props changed) projects/tcp_cc_8.x/sys/dev/mn/if_mn.c (props changed) projects/tcp_cc_8.x/sys/dev/xen/xenpci/ (props changed) projects/tcp_cc_8.x/sys/kern/kern_cons.c (props changed) projects/tcp_cc_8.x/sys/netinet/cc.c projects/tcp_cc_8.x/sys/netinet/cc_cubic.c projects/tcp_cc_8.x/sys/netinet/cc_htcp.c projects/tcp_cc_8.x/sys/netinet/cc_newreno.c projects/tcp_cc_8.x/sys/security/mac/mac_cred.c (props changed) projects/tcp_cc_8.x/sys/security/mac_bsdextended/ugidfw_system.c (props changed) projects/tcp_cc_8.x/sys/security/mac_bsdextended/ugidfw_vnode.c (props changed) projects/tcp_cc_8.x/tools/regression/lib/msun/test-conj.t (props changed) projects/tcp_cc_8.x/tools/regression/poll/ (props changed) projects/tcp_cc_8.x/tools/regression/priv/ (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/tcp_cc_8.x/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs.h (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/tcp_cc_8.x/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/tcp_cc_8.x/tools/tools/termcap/termcap.pl (props changed) projects/tcp_cc_8.x/tools/tools/vimage/ (props changed) projects/tcp_cc_8.x/usr.bin/calendar/calendars/calendar.freebsd (props changed) projects/tcp_cc_8.x/usr.bin/csup/ (props changed) projects/tcp_cc_8.x/usr.bin/fstat/ (props changed) projects/tcp_cc_8.x/usr.bin/look/ (props changed) projects/tcp_cc_8.x/usr.bin/procstat/ (props changed) projects/tcp_cc_8.x/usr.bin/w/ (props changed) projects/tcp_cc_8.x/usr.bin/whois/ (props changed) projects/tcp_cc_8.x/usr.sbin/ (props changed) projects/tcp_cc_8.x/usr.sbin/arp/ (props changed) projects/tcp_cc_8.x/usr.sbin/dumpcis/cardinfo.h (props changed) projects/tcp_cc_8.x/usr.sbin/dumpcis/cis.h (props changed) projects/tcp_cc_8.x/usr.sbin/freebsd-update/ (props changed) projects/tcp_cc_8.x/usr.sbin/iostat/ (props changed) projects/tcp_cc_8.x/usr.sbin/jls/ (props changed) projects/tcp_cc_8.x/usr.sbin/lpr/ (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/tcp_cc_8.x/usr.sbin/makefs/getid.c (props changed) projects/tcp_cc_8.x/usr.sbin/mfiutil/mfiutil.8 (props changed) projects/tcp_cc_8.x/usr.sbin/ndp/ (props changed) projects/tcp_cc_8.x/usr.sbin/ntp/ (props changed) projects/tcp_cc_8.x/usr.sbin/ppp/ (props changed) projects/tcp_cc_8.x/usr.sbin/pstat/ (props changed) projects/tcp_cc_8.x/usr.sbin/sysinstall/ (props changed) projects/tcp_cc_8.x/usr.sbin/traceroute6/ (props changed) projects/tcp_cc_8.x/usr.sbin/wpa/ (props changed) projects/tcp_cc_8.x/usr.sbin/zic/ (props changed) Modified: projects/tcp_cc_8.x/sys/netinet/cc.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc.c Tue Oct 13 19:49:33 2009 (r198045) +++ projects/tcp_cc_8.x/sys/netinet/cc.c Tue Oct 13 19:51:31 2009 (r198046) @@ -47,14 +47,15 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include -#include +#include +#include +#include /* * List of available cc algorithms on the current system. First element Modified: projects/tcp_cc_8.x/sys/netinet/cc_cubic.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc_cubic.c Tue Oct 13 19:49:33 2009 (r198045) +++ projects/tcp_cc_8.x/sys/netinet/cc_cubic.c Tue Oct 13 19:51:31 2009 (r198046) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include @@ -59,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include int cubic_mod_init(void); int cubic_cb_init(struct tcpcb *tp); Modified: projects/tcp_cc_8.x/sys/netinet/cc_htcp.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc_htcp.c Tue Oct 13 19:49:33 2009 (r198045) +++ projects/tcp_cc_8.x/sys/netinet/cc_htcp.c Tue Oct 13 19:51:31 2009 (r198046) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include @@ -62,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include /* useful defines */ #define MODNAME "HTCP congestion control" Modified: projects/tcp_cc_8.x/sys/netinet/cc_newreno.c ============================================================================== --- projects/tcp_cc_8.x/sys/netinet/cc_newreno.c Tue Oct 13 19:49:33 2009 (r198045) +++ projects/tcp_cc_8.x/sys/netinet/cc_newreno.c Tue Oct 13 19:51:31 2009 (r198046) @@ -37,15 +37,16 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include +#include +#include #include -#include +#include /* * NewReno CC functions