From owner-svn-src-releng@FreeBSD.ORG Mon Dec 9 13:44:07 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA2072C5; Mon, 9 Dec 2013 13:44:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB45E1AD7; Mon, 9 Dec 2013 13:44:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9Di7wF023310; Mon, 9 Dec 2013 13:44:07 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9Di7Lt023309; Mon, 9 Dec 2013 13:44:07 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312091344.rB9Di7Lt023309@svn.freebsd.org> From: Glen Barber Date: Mon, 9 Dec 2013 13:44:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259128 - in releng/10.0: . contrib/ipfilter contrib/top share/man/man4 share/mk sys/amd64/include sys/contrib/dev/acpica sys/contrib/ipfilter/netinet sys/dev/fdt sys/x86/include X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 13:44:07 -0000 Author: gjb Date: Mon Dec 9 13:44:07 2013 New Revision: 259128 URL: http://svnweb.freebsd.org/changeset/base/259128 Log: Remove svn:mergeinfo from the releng/10.0 branch. After branch creation from stable/10, the stable/10 branch mergeinfo was moved to the root of the branch. Since there have not been any merges from stable/10 to releng/10.0 yet, we do not need to track any of the existing mergeinfo here. Merges to releng/10.0 should now be done to the root of the branch. For future branches during the release cycle, unless otherwise noted, this change will be done as part of the stable/ and releng/ branch creation. Discussed with: peter Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: Directory Properties: releng/10.0/ (props changed) releng/10.0/MAINTAINERS (props changed) releng/10.0/Makefile.inc1 (props changed) releng/10.0/ObsoleteFiles.inc (props changed) releng/10.0/UPDATING (props changed) releng/10.0/bin/df/ (props changed) releng/10.0/bin/freebsd-version/ (props changed) releng/10.0/cddl/ (props changed) releng/10.0/cddl/contrib/opensolaris/ (props changed) releng/10.0/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) releng/10.0/cddl/contrib/opensolaris/cmd/zfs/ (props changed) releng/10.0/cddl/contrib/opensolaris/lib/libzfs/ (props changed) releng/10.0/contrib/apr/ (props changed) releng/10.0/contrib/apr-util/ (props changed) releng/10.0/contrib/atf/ (props changed) releng/10.0/contrib/binutils/ (props changed) releng/10.0/contrib/bmake/ (props changed) releng/10.0/contrib/byacc/ (props changed) releng/10.0/contrib/bzip2/ (props changed) releng/10.0/contrib/com_err/ (props changed) releng/10.0/contrib/compiler-rt/ (props changed) releng/10.0/contrib/dialog/ (props changed) releng/10.0/contrib/dtc/ (props changed) releng/10.0/contrib/ee/ (props changed) releng/10.0/contrib/expat/ (props changed) releng/10.0/contrib/file/ (props changed) releng/10.0/contrib/gcc/ (props changed) releng/10.0/contrib/gdb/ (props changed) releng/10.0/contrib/gdtoa/ (props changed) releng/10.0/contrib/groff/ (props changed) releng/10.0/contrib/ipfilter/ (props changed) releng/10.0/contrib/ipfilter/ml_ipl.c (props changed) releng/10.0/contrib/ipfilter/mlfk_ipl.c (props changed) releng/10.0/contrib/ipfilter/mlh_rule.c (props changed) releng/10.0/contrib/ipfilter/mli_ipl.c (props changed) releng/10.0/contrib/ipfilter/mln_ipl.c (props changed) releng/10.0/contrib/ipfilter/mls_ipl.c (props changed) releng/10.0/contrib/ldns/ (props changed) releng/10.0/contrib/less/ (props changed) releng/10.0/contrib/libarchive/ (props changed) releng/10.0/contrib/libarchive/cpio/ (props changed) releng/10.0/contrib/libarchive/libarchive/ (props changed) releng/10.0/contrib/libarchive/libarchive_fe/ (props changed) releng/10.0/contrib/libarchive/tar/ (props changed) releng/10.0/contrib/libc++/ (props changed) releng/10.0/contrib/libc-vis/ (props changed) releng/10.0/contrib/libcxxrt/ (props changed) releng/10.0/contrib/libexecinfo/ (props changed) releng/10.0/contrib/libpcap/ (props changed) releng/10.0/contrib/libstdc++/ (props changed) releng/10.0/contrib/llvm/ (props changed) releng/10.0/contrib/llvm/tools/clang/ (props changed) releng/10.0/contrib/mtree/ (props changed) releng/10.0/contrib/ncurses/ (props changed) releng/10.0/contrib/netcat/ (props changed) releng/10.0/contrib/ntp/ (props changed) releng/10.0/contrib/nvi/ (props changed) releng/10.0/contrib/one-true-awk/ (props changed) releng/10.0/contrib/openbsm/ (props changed) releng/10.0/contrib/openpam/ (props changed) releng/10.0/contrib/openresolv/ (props changed) releng/10.0/contrib/pf/ (props changed) releng/10.0/contrib/sendmail/ (props changed) releng/10.0/contrib/serf/ (props changed) releng/10.0/contrib/smbfs/ (props changed) releng/10.0/contrib/subversion/ (props changed) releng/10.0/contrib/tcpdump/ (props changed) releng/10.0/contrib/tcsh/ (props changed) releng/10.0/contrib/tnftp/ (props changed) releng/10.0/contrib/top/ (props changed) releng/10.0/contrib/top/install-sh (props changed) releng/10.0/contrib/tzcode/stdtime/ (props changed) releng/10.0/contrib/tzcode/zic/ (props changed) releng/10.0/contrib/tzdata/ (props changed) releng/10.0/contrib/unbound/ (props changed) releng/10.0/contrib/wpa/ (props changed) releng/10.0/contrib/xz/ (props changed) releng/10.0/crypto/heimdal/ (props changed) releng/10.0/crypto/openssh/ (props changed) releng/10.0/crypto/openssl/ (props changed) releng/10.0/etc/ (props changed) releng/10.0/etc/rc.d/ (props changed) releng/10.0/gnu/lib/ (props changed) releng/10.0/gnu/usr.bin/binutils/ (props changed) releng/10.0/gnu/usr.bin/cc/cc_tools/ (props changed) releng/10.0/gnu/usr.bin/gdb/ (props changed) releng/10.0/include/ (props changed) releng/10.0/lib/ (props changed) releng/10.0/lib/libc/ (props changed) releng/10.0/lib/libc/stdtime/ (props changed) releng/10.0/lib/libc_nonshared/ (props changed) releng/10.0/lib/libfetch/ (props changed) releng/10.0/lib/libiconv_modules/ (props changed) releng/10.0/lib/libsmb/ (props changed) releng/10.0/lib/libthr/ (props changed) releng/10.0/lib/libutil/ (props changed) releng/10.0/lib/libvmmapi/ (props changed) releng/10.0/lib/libyaml/ (props changed) releng/10.0/lib/libz/ (props changed) releng/10.0/release/ (props changed) releng/10.0/release/doc/ (props changed) releng/10.0/sbin/ (props changed) releng/10.0/sbin/camcontrol/ (props changed) releng/10.0/sbin/dumpon/ (props changed) releng/10.0/sbin/hastd/ (props changed) releng/10.0/sbin/ifconfig/ (props changed) releng/10.0/sbin/ipfw/ (props changed) releng/10.0/sbin/nvmecontrol/ (props changed) releng/10.0/share/ (props changed) releng/10.0/share/examples/bhyve/ (props changed) releng/10.0/share/i18n/csmapper/JIS/ (props changed) releng/10.0/share/i18n/esdb/EUC/ (props changed) releng/10.0/share/man/ (props changed) releng/10.0/share/man/man4/ (props changed) releng/10.0/share/man/man4/bhyve.4 (props changed) releng/10.0/share/man/man5/ (props changed) releng/10.0/share/man/man7/ (props changed) releng/10.0/share/man/man8/ (props changed) releng/10.0/share/misc/ (props changed) releng/10.0/share/mk/ (props changed) releng/10.0/share/mk/bsd.arch.inc.mk (props changed) releng/10.0/share/syscons/ (props changed) releng/10.0/share/zoneinfo/ (props changed) releng/10.0/sys/ (props changed) releng/10.0/sys/amd64/include/vmm.h (props changed) releng/10.0/sys/amd64/include/vmm_dev.h (props changed) releng/10.0/sys/amd64/include/vmm_instruction_emul.h (props changed) releng/10.0/sys/amd64/include/xen/ (props changed) releng/10.0/sys/amd64/vmm/ (props changed) releng/10.0/sys/boot/ (props changed) releng/10.0/sys/boot/i386/efi/ (props changed) releng/10.0/sys/boot/ia64/efi/ (props changed) releng/10.0/sys/boot/ia64/ski/ (props changed) releng/10.0/sys/boot/powerpc/boot1.chrp/ (props changed) releng/10.0/sys/boot/powerpc/ofw/ (props changed) releng/10.0/sys/cddl/contrib/opensolaris/ (props changed) releng/10.0/sys/conf/ (props changed) releng/10.0/sys/contrib/dev/acpica/ (props changed) releng/10.0/sys/contrib/dev/acpica/changes.txt (props changed) releng/10.0/sys/contrib/dev/acpica/common/ (props changed) releng/10.0/sys/contrib/dev/acpica/compiler/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/debugger/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/disassembler/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/dispatcher/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/events/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/executer/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/hardware/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/namespace/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/parser/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/resources/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/tables/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/utilities/ (props changed) releng/10.0/sys/contrib/dev/acpica/include/ (props changed) releng/10.0/sys/contrib/dev/acpica/os_specific/ (props changed) releng/10.0/sys/contrib/ipfilter/ (props changed) releng/10.0/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (props changed) releng/10.0/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (props changed) releng/10.0/sys/contrib/libfdt/ (props changed) releng/10.0/sys/contrib/octeon-sdk/ (props changed) releng/10.0/sys/contrib/x86emu/ (props changed) releng/10.0/sys/dev/bvm/ (props changed) releng/10.0/sys/dev/fdt/fdt_ic_if.m (props changed) releng/10.0/sys/dev/hyperv/ (props changed) releng/10.0/sys/modules/hyperv/ (props changed) releng/10.0/sys/modules/vmm/ (props changed) releng/10.0/sys/x86/include/acpica_machdep.h (props changed) releng/10.0/tools/ (props changed) releng/10.0/tools/build/ (props changed) releng/10.0/tools/build/options/ (props changed) releng/10.0/tools/tools/atsectl/ (props changed) releng/10.0/usr.bin/calendar/ (props changed) releng/10.0/usr.bin/csup/ (props changed) releng/10.0/usr.bin/iscsictl/ (props changed) releng/10.0/usr.bin/procstat/ (props changed) releng/10.0/usr.sbin/ (props changed) releng/10.0/usr.sbin/bhyve/ (props changed) releng/10.0/usr.sbin/bhyvectl/ (props changed) releng/10.0/usr.sbin/bhyveload/ (props changed) releng/10.0/usr.sbin/bsdconfig/ (props changed) releng/10.0/usr.sbin/bsdinstall/ (props changed) releng/10.0/usr.sbin/ctladm/ (props changed) releng/10.0/usr.sbin/ctld/ (props changed) releng/10.0/usr.sbin/freebsd-update/ (props changed) releng/10.0/usr.sbin/jail/ (props changed) releng/10.0/usr.sbin/mergemaster/ (props changed) releng/10.0/usr.sbin/mount_smbfs/ (props changed) releng/10.0/usr.sbin/ndiscvt/ (props changed) releng/10.0/usr.sbin/pkg/ (props changed) releng/10.0/usr.sbin/rtadvctl/ (props changed) releng/10.0/usr.sbin/rtadvd/ (props changed) releng/10.0/usr.sbin/rtsold/ (props changed) releng/10.0/usr.sbin/zic/ (props changed) From owner-svn-src-releng@FreeBSD.ORG Tue Dec 10 17:26:53 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 13DDC67D; Tue, 10 Dec 2013 17:26:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F38B41F1A; Tue, 10 Dec 2013 17:26:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAHQqJ9036811; Tue, 10 Dec 2013 17:26:52 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAHQqkJ036809; Tue, 10 Dec 2013 17:26:52 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312101726.rBAHQqkJ036809@svn.freebsd.org> From: Glen Barber Date: Tue, 10 Dec 2013 17:26:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259181 - releng/10.0/release X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 17:26:53 -0000 Author: gjb Date: Tue Dec 10 17:26:52 2013 New Revision: 259181 URL: http://svnweb.freebsd.org/changeset/base/259181 Log: MFstable10 r259151: Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually passed to 'make release'. Approved by: re (glebius) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/release.conf.sample releng/10.0/release/release.sh Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/release/release.conf.sample ============================================================================== --- releng/10.0/release/release.conf.sample Tue Dec 10 17:16:13 2013 (r259180) +++ releng/10.0/release/release.conf.sample Tue Dec 10 17:26:52 2013 (r259181) @@ -39,3 +39,4 @@ PORTBRANCH="ports/head@rHEAD" #NODOC= #NOPORTS= #RELSTRING= +#WITH_DVD= Modified: releng/10.0/release/release.sh ============================================================================== --- releng/10.0/release/release.sh Tue Dec 10 17:16:13 2013 (r259180) +++ releng/10.0/release/release.sh Tue Dec 10 17:26:52 2013 (r259181) @@ -72,6 +72,9 @@ KERNEL="GENERIC" NODOC= NOPORTS= +# Set to non-empty value to build dvd1.iso as part of the release. +WITH_DVD= + usage() { echo "Usage: $0 [-c release.conf]" exit 1 @@ -129,7 +132,7 @@ CHROOT_DMAKEFLAGS="${CONF_FILES}" RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}" RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \ - ${DOCPORTS}" + ${DOCPORTS} WITH_DVD=${WITH_DVD}" # Force src checkout if configured FORCE_SRC_KEY= From owner-svn-src-releng@FreeBSD.ORG Tue Dec 10 19:12:17 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03E15D7B; Tue, 10 Dec 2013 19:12:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E3A25173D; Tue, 10 Dec 2013 19:12:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAJCGhp076976; Tue, 10 Dec 2013 19:12:16 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAJCGxE076975; Tue, 10 Dec 2013 19:12:16 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201312101912.rBAJCGxE076975@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 10 Dec 2013 19:12:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259184 - releng/10.0/sys/net80211 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 19:12:17 -0000 Author: gavin Date: Tue Dec 10 19:12:16 2013 New Revision: 259184 URL: http://svnweb.freebsd.org/changeset/base/259184 Log: Merge r259172 from stable/10 (head r257754 by adrian): Don't return ENOBUFS if the transmit path handles the frame but queues it (eg in power save.) PR: kern/183727 Approved by: re (glebius) Modified: releng/10.0/sys/net80211/ieee80211_output.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/net80211/ieee80211_output.c ============================================================================== --- releng/10.0/sys/net80211/ieee80211_output.c Tue Dec 10 18:18:39 2013 (r259183) +++ releng/10.0/sys/net80211/ieee80211_output.c Tue Dec 10 19:12:16 2013 (r259184) @@ -143,8 +143,12 @@ ieee80211_vap_pkt_send_dest(struct ieee8 */ (void) ieee80211_pwrsave(ni, m); ieee80211_free_node(ni); - /* XXX better status? */ - return (ENOBUFS); + + /* + * We queued it fine, so tell the upper layer + * that we consumed it. + */ + return (0); } /* calculate priority so drivers can find the tx queue */ if (ieee80211_classify(ni, m)) { @@ -155,8 +159,9 @@ ieee80211_vap_pkt_send_dest(struct ieee8 ifp->if_oerrors++; m_freem(m); ieee80211_free_node(ni); + /* XXX better status? */ - return (ENOBUFS); + return (0); } /* * Stash the node pointer. Note that we do this after @@ -168,7 +173,6 @@ ieee80211_vap_pkt_send_dest(struct ieee8 BPF_MTAP(ifp, m); /* 802.3 tx */ - /* * Check if A-MPDU tx aggregation is setup or if we * should try to enable it. The sta must be associated From owner-svn-src-releng@FreeBSD.ORG Tue Dec 10 19:14:19 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C899FF98; Tue, 10 Dec 2013 19:14:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B48B71752; Tue, 10 Dec 2013 19:14:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAJEJ1j077338; Tue, 10 Dec 2013 19:14:19 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAJEJai077337; Tue, 10 Dec 2013 19:14:19 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201312101914.rBAJEJai077337@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 10 Dec 2013 19:14:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259185 - releng/10.0/sys/net80211 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 19:14:19 -0000 Author: gavin Date: Tue Dec 10 19:14:19 2013 New Revision: 259185 URL: http://svnweb.freebsd.org/changeset/base/259185 Log: Merge r259173 from stable/10 (head r258758 by adrian): Make sure any waiters on the scan results get notified if the scan task decides to do nothing. If this isn't done, then a scan request whilst a scan occurs in an active channel set or a completed channel set will hang. Approved by: re (glebius) Modified: releng/10.0/sys/net80211/ieee80211_scan.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/net80211/ieee80211_scan.c ============================================================================== --- releng/10.0/sys/net80211/ieee80211_scan.c Tue Dec 10 19:12:16 2013 (r259184) +++ releng/10.0/sys/net80211/ieee80211_scan.c Tue Dec 10 19:14:19 2013 (r259185) @@ -859,6 +859,7 @@ scan_task(void *arg, int pending) if (ss->ss_next == ss->ss_last) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: no channels to scan\n", __func__); + scandone = 1; goto done; } From owner-svn-src-releng@FreeBSD.ORG Tue Dec 10 19:17:32 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79ABD4D6; Tue, 10 Dec 2013 19:17:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66290178A; Tue, 10 Dec 2013 19:17:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAJHWdj077975; Tue, 10 Dec 2013 19:17:32 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAJHWGV077974; Tue, 10 Dec 2013 19:17:32 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201312101917.rBAJHWGV077974@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 10 Dec 2013 19:17:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259187 - releng/10.0/sys/net80211 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 19:17:32 -0000 Author: gavin Date: Tue Dec 10 19:17:31 2013 New Revision: 259187 URL: http://svnweb.freebsd.org/changeset/base/259187 Log: Merge r259174 from stable/10 (head r256294 by adrian): Fix the "am I a net80211 vap" check for bpf listeners. I changed it to use if_transmit a while ago but apparently with monitor mode the if_transmit method is overridden. This is (mostly) a workaround until a more permanent solution can be found. Submitted by: Patrick Kelsey Approved by: re (glebius) Modified: releng/10.0/sys/net80211/ieee80211_freebsd.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/net80211/ieee80211_freebsd.c ============================================================================== --- releng/10.0/sys/net80211/ieee80211_freebsd.c Tue Dec 10 19:15:26 2013 (r259186) +++ releng/10.0/sys/net80211/ieee80211_freebsd.c Tue Dec 10 19:17:31 2013 (r259187) @@ -808,9 +808,9 @@ static eventhandler_tag wlan_ifllevent; static void bpf_track(void *arg, struct ifnet *ifp, int dlt, int attach) { - /* NB: identify vap's by if_start */ + /* NB: identify vap's by if_init */ if (dlt == DLT_IEEE802_11_RADIO && - ifp->if_transmit == ieee80211_vap_transmit) { + ifp->if_init == ieee80211_init) { struct ieee80211vap *vap = ifp->if_softc; /* * Track bpf radiotap listener state. We mark the vap From owner-svn-src-releng@FreeBSD.ORG Tue Dec 10 19:22:03 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45CC374E; Tue, 10 Dec 2013 19:22:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 31FC11819; Tue, 10 Dec 2013 19:22:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAJM3XP080961; Tue, 10 Dec 2013 19:22:03 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAJM2BJ080958; Tue, 10 Dec 2013 19:22:02 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201312101922.rBAJM2BJ080958@svn.freebsd.org> From: Gavin Atkinson Date: Tue, 10 Dec 2013 19:22:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259188 - releng/10.0/sys/net80211 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 19:22:03 -0000 Author: gavin Date: Tue Dec 10 19:22:02 2013 New Revision: 259188 URL: http://svnweb.freebsd.org/changeset/base/259188 Log: Merge r259175 from stable/10 (head r257065 by adrian): Fix a use-after-free node reference issue when waiting for a return from a management frame transmission. Approved by: re (glebius) Modified: releng/10.0/sys/net80211/ieee80211_output.c releng/10.0/sys/net80211/ieee80211_proto.c releng/10.0/sys/net80211/ieee80211_proto.h Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/net80211/ieee80211_output.c ============================================================================== --- releng/10.0/sys/net80211/ieee80211_output.c Tue Dec 10 19:17:31 2013 (r259187) +++ releng/10.0/sys/net80211/ieee80211_output.c Tue Dec 10 19:22:02 2013 (r259188) @@ -2736,20 +2736,35 @@ ieee80211_alloc_cts(struct ieee80211com static void ieee80211_tx_mgt_timeout(void *arg) { - struct ieee80211_node *ni = arg; - struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211vap *vap = arg; + IEEE80211_LOCK(vap->iv_ic); if (vap->iv_state != IEEE80211_S_INIT && (vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0) { /* * NB: it's safe to specify a timeout as the reason here; * it'll only be used in the right state. */ - ieee80211_new_state(vap, IEEE80211_S_SCAN, + ieee80211_new_state_locked(vap, IEEE80211_S_SCAN, IEEE80211_SCAN_FAIL_TIMEOUT); } + IEEE80211_UNLOCK(vap->iv_ic); } +/* + * This is the callback set on net80211-sourced transmitted + * authentication request frames. + * + * This does a couple of things: + * + * + If the frame transmitted was a success, it schedules a future + * event which will transition the interface to scan. + * If a state transition _then_ occurs before that event occurs, + * said state transition will cancel this callout. + * + * + If the frame transmit was a failure, it immediately schedules + * the transition back to scan. + */ static void ieee80211_tx_mgt_cb(struct ieee80211_node *ni, void *arg, int status) { @@ -2767,10 +2782,11 @@ ieee80211_tx_mgt_cb(struct ieee80211_nod * * XXX what happens if !acked but response shows up before callback? */ - if (vap->iv_state == ostate) + if (vap->iv_state == ostate) { callout_reset(&vap->iv_mgtsend, status == 0 ? IEEE80211_TRANS_WAIT*hz : 0, - ieee80211_tx_mgt_timeout, ni); + ieee80211_tx_mgt_timeout, vap); + } } static void Modified: releng/10.0/sys/net80211/ieee80211_proto.c ============================================================================== --- releng/10.0/sys/net80211/ieee80211_proto.c Tue Dec 10 19:17:31 2013 (r259187) +++ releng/10.0/sys/net80211/ieee80211_proto.c Tue Dec 10 19:22:02 2013 (r259188) @@ -107,8 +107,6 @@ static void update_promisc(void *, int); static void update_channel(void *, int); static void update_chw(void *, int); static void ieee80211_newstate_cb(void *, int); -static int ieee80211_new_state_locked(struct ieee80211vap *, - enum ieee80211_state, int); static int null_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, @@ -1834,7 +1832,7 @@ done: * is usually a mistake and indicates lack of proper integration * with the net80211 layer. */ -static int +int ieee80211_new_state_locked(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { Modified: releng/10.0/sys/net80211/ieee80211_proto.h ============================================================================== --- releng/10.0/sys/net80211/ieee80211_proto.h Tue Dec 10 19:17:31 2013 (r259187) +++ releng/10.0/sys/net80211/ieee80211_proto.h Tue Dec 10 19:22:02 2013 (r259188) @@ -332,6 +332,8 @@ void ieee80211_dturbo_switch(struct ieee void ieee80211_swbmiss(void *arg); void ieee80211_beacon_miss(struct ieee80211com *); int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int); +int ieee80211_new_state_locked(struct ieee80211vap *, enum ieee80211_state, + int); void ieee80211_print_essid(const uint8_t *, int); void ieee80211_dump_pkt(struct ieee80211com *, const uint8_t *, int, int, int); From owner-svn-src-releng@FreeBSD.ORG Thu Dec 12 22:01:43 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11DB0BCC; Thu, 12 Dec 2013 22:01:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F10071D5A; Thu, 12 Dec 2013 22:01:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBCM1gup004600; Thu, 12 Dec 2013 22:01:42 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBCM1grq004599; Thu, 12 Dec 2013 22:01:42 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201312122201.rBCM1grq004599@svn.freebsd.org> From: Dimitry Andric Date: Thu, 12 Dec 2013 22:01:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259278 - releng/10.0/contrib/llvm/tools/clang/lib/CodeGen X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2013 22:01:43 -0000 Author: dim Date: Thu Dec 12 22:01:42 2013 New Revision: 259278 URL: http://svnweb.freebsd.org/changeset/base/259278 Log: Merge r259214 from stable/10 (head r259100): Pull in r196658 from upstream clang trunk: CodeGen: Don't emit linkage on thunks that aren't emitted because they're vararg. This can happen when we're trying to emit a thunk with available_externally linkage with optimization enabled but bail because it doesn't make sense for vararg functions. [LLVM] PR18098. This should fix clang "Broken module found, compilation aborted" errors when building the qt4-based dvbcut port. Reported by: se Approved by: re (glebius) Modified: releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp ============================================================================== --- releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Thu Dec 12 21:51:33 2013 (r259277) +++ releng/10.0/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp Thu Dec 12 22:01:42 2013 (r259278) @@ -454,10 +454,9 @@ void CodeGenVTables::EmitThunk(GlobalDec } else { // Normal thunk body generation. CodeGenFunction(CGM).GenerateThunk(ThunkFn, FnInfo, GD, Thunk); + if (UseAvailableExternallyLinkage) + ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage); } - - if (UseAvailableExternallyLinkage) - ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage); } void CodeGenVTables::MaybeEmitThunkAvailableExternally(GlobalDecl GD, From owner-svn-src-releng@FreeBSD.ORG Thu Dec 12 22:04:48 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A492EF93; Thu, 12 Dec 2013 22:04:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7661D1D84; Thu, 12 Dec 2013 22:04:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBCM4mY7005128; Thu, 12 Dec 2013 22:04:48 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBCM4mU7005127; Thu, 12 Dec 2013 22:04:48 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201312122204.rBCM4mU7005127@svn.freebsd.org> From: Dimitry Andric Date: Thu, 12 Dec 2013 22:04:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259279 - releng/10.0/contrib/gcc/config/i386 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2013 22:04:48 -0000 Author: dim Date: Thu Dec 12 22:04:47 2013 New Revision: 259279 URL: http://svnweb.freebsd.org/changeset/base/259279 Log: Merge r259216 from stable/10 (head r259111): Use correct casts in gcc's emmintrin.h for the first arguments of the following builtin functions: * __builtin_ia32_pslldi128() takes __v4si instead of __v8hi * __builtin_ia32_psllqi128() takes __v2di instead of __v8hi * __builtin_ia32_psradi128() takes __v4si instead of __v8hi This should fix the following errors when building the LINT kernel with gcc: sys/crypto/aesni/aesni_wrap.c:191: error: incompatible type for argument 1 of '__builtin_ia32_psradi128' sys/crypto/aesni/aesni_wrap.c:195: error: incompatible type for argument 1 of '__builtin_ia32_pslldi128' Approved by: re (glebius) Modified: releng/10.0/contrib/gcc/config/i386/emmintrin.h Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/contrib/gcc/config/i386/emmintrin.h ============================================================================== --- releng/10.0/contrib/gcc/config/i386/emmintrin.h Thu Dec 12 22:01:42 2013 (r259278) +++ releng/10.0/contrib/gcc/config/i386/emmintrin.h Thu Dec 12 22:04:47 2013 (r259279) @@ -1126,9 +1126,9 @@ _mm_slli_epi64 (__m128i __A, int __B) #define _mm_slli_epi16(__A, __B) \ ((__m128i)__builtin_ia32_psllwi128 ((__v8hi)(__A), __B)) #define _mm_slli_epi32(__A, __B) \ - ((__m128i)__builtin_ia32_pslldi128 ((__v8hi)(__A), __B)) + ((__m128i)__builtin_ia32_pslldi128 ((__v4si)(__A), __B)) #define _mm_slli_epi64(__A, __B) \ - ((__m128i)__builtin_ia32_psllqi128 ((__v8hi)(__A), __B)) + ((__m128i)__builtin_ia32_psllqi128 ((__v2di)(__A), __B)) #endif #if 0 @@ -1147,7 +1147,7 @@ _mm_srai_epi32 (__m128i __A, int __B) #define _mm_srai_epi16(__A, __B) \ ((__m128i)__builtin_ia32_psrawi128 ((__v8hi)(__A), __B)) #define _mm_srai_epi32(__A, __B) \ - ((__m128i)__builtin_ia32_psradi128 ((__v8hi)(__A), __B)) + ((__m128i)__builtin_ia32_psradi128 ((__v4si)(__A), __B)) #endif #if 0 From owner-svn-src-releng@FreeBSD.ORG Fri Dec 13 21:22:12 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9ADAAA0D; Fri, 13 Dec 2013 21:22:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8788B1EEE; Fri, 13 Dec 2013 21:22:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBDLMCVx028927; Fri, 13 Dec 2013 21:22:12 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBDLMCBg028926; Fri, 13 Dec 2013 21:22:12 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312132122.rBDLMCBg028926@svn.freebsd.org> From: Edward Tomasz Napierala Date: Fri, 13 Dec 2013 21:22:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259332 - releng/10.0/sys/cam/ctl X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 21:22:12 -0000 Author: trasz Date: Fri Dec 13 21:22:12 2013 New Revision: 259332 URL: http://svnweb.freebsd.org/changeset/base/259332 Log: MFC r258871: Properly report an error instead of panicing when user tries to create LUN backed by non-disk device, e.g. /dev/null. Approved by: re (glebius) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/sys/cam/ctl/ctl_backend_block.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- releng/10.0/sys/cam/ctl/ctl_backend_block.c Fri Dec 13 20:54:45 2013 (r259331) +++ releng/10.0/sys/cam/ctl/ctl_backend_block.c Fri Dec 13 21:22:12 2013 (r259332) @@ -1485,6 +1485,7 @@ ctl_be_block_close(struct ctl_be_block_l case CTL_BE_BLOCK_FILE: break; case CTL_BE_BLOCK_NONE: + break; default: panic("Unexpected backend type."); break; @@ -1503,6 +1504,7 @@ ctl_be_block_close(struct ctl_be_block_l } break; case CTL_BE_BLOCK_NONE: + break; default: panic("Unexpected backend type."); break; @@ -1589,7 +1591,7 @@ ctl_be_block_open(struct ctl_be_block_so } else { error = EINVAL; snprintf(req->error_str, sizeof(req->error_str), - "%s is not a disk or file", be_lun->dev_path); + "%s is not a disk or plain file", be_lun->dev_path); } VOP_UNLOCK(be_lun->vn, 0); From owner-svn-src-releng@FreeBSD.ORG Fri Dec 13 21:27:16 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD8B9C59; Fri, 13 Dec 2013 21:27:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B9CA91F35; Fri, 13 Dec 2013 21:27:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBDLRGHx029476; Fri, 13 Dec 2013 21:27:16 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBDLRGHg029475; Fri, 13 Dec 2013 21:27:16 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312132127.rBDLRGHg029475@svn.freebsd.org> From: Edward Tomasz Napierala Date: Fri, 13 Dec 2013 21:27:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259333 - releng/10.0/usr.sbin/ctld X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 21:27:16 -0000 Author: trasz Date: Fri Dec 13 21:27:16 2013 New Revision: 259333 URL: http://svnweb.freebsd.org/changeset/base/259333 Log: MFC r259182: Fix handling for empty auth-groups. Without it, ctld child process would either exit on assertion, or, if assertions are not enabled, fail to authenticate the target. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/usr.sbin/ctld/login.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/usr.sbin/ctld/login.c ============================================================================== --- releng/10.0/usr.sbin/ctld/login.c Fri Dec 13 21:22:12 2013 (r259332) +++ releng/10.0/usr.sbin/ctld/login.c Fri Dec 13 21:27:16 2013 (r259333) @@ -1007,6 +1007,14 @@ login(struct connection *conn) return; } + if (ag->ag_type == AG_TYPE_UNKNOWN) { + /* + * This can happen with empty auth-group. + */ + login_send_error(request, 0x02, 0x01); + log_errx(1, "auth-group type not set, denying access"); + } + log_debugx("CHAP authentication required"); auth_method = keys_find(request_keys, "AuthMethod"); From owner-svn-src-releng@FreeBSD.ORG Fri Dec 13 21:41:24 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CE7662C; Fri, 13 Dec 2013 21:41:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EBB5C1095; Fri, 13 Dec 2013 21:41:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBDLfN1V035867; Fri, 13 Dec 2013 21:41:23 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBDLfNua035866; Fri, 13 Dec 2013 21:41:23 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312132141.rBDLfNua035866@svn.freebsd.org> From: Edward Tomasz Napierala Date: Fri, 13 Dec 2013 21:41:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259336 - releng/10.0/sys/dev/iscsi X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 21:41:24 -0000 Author: trasz Date: Fri Dec 13 21:41:23 2013 New Revision: 259336 URL: http://svnweb.freebsd.org/changeset/base/259336 Log: MFC r259183: Properly refuse handoff requests on already connected sessions. Previously this would result in dropping the session. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/sys/dev/iscsi/iscsi.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/iscsi/iscsi.c ============================================================================== --- releng/10.0/sys/dev/iscsi/iscsi.c Fri Dec 13 21:40:12 2013 (r259335) +++ releng/10.0/sys/dev/iscsi/iscsi.c Fri Dec 13 21:41:23 2013 (r259336) @@ -1247,6 +1247,18 @@ iscsi_ioctl_daemon_handoff(struct iscsi_ sx_sunlock(&sc->sc_lock); return (EINVAL); } + if (is->is_connected) { + /* + * This might have happened because another iscsid(8) + * instance handed off the connection in the meantime. + * Just return. + */ + ISCSI_SESSION_WARN(is, "handoff on already connected " + "session"); + ISCSI_SESSION_UNLOCK(is); + sx_sunlock(&sc->sc_lock); + return (EBUSY); + } strlcpy(is->is_target_alias, handoff->idh_target_alias, sizeof(is->is_target_alias)); From owner-svn-src-releng@FreeBSD.ORG Sat Dec 14 00:25:26 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78A6B4EE; Sat, 14 Dec 2013 00:25:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 643F31ED8; Sat, 14 Dec 2013 00:25:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE0PQ7S098717; Sat, 14 Dec 2013 00:25:26 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE0PQmo098716; Sat, 14 Dec 2013 00:25:26 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201312140025.rBE0PQmo098716@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sat, 14 Dec 2013 00:25:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259367 - releng/10.0/sys/dev/drm2/radeon X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 00:25:26 -0000 Author: dumbbell Date: Sat Dec 14 00:25:25 2013 New Revision: 259367 URL: http://svnweb.freebsd.org/changeset/base/259367 Log: MFC r259234: drm/radeon: agp_info->ai_aperture_size is in bytes, not Mbytes This fixes radeon_agp_init() and gtt_size is now correct. However, this is not enough to make Radeon AGP cards work: ttm_agp_backend.c isn't implemented yet. Submitted by: tijl@ Approved by: re (gjb) Modified: releng/10.0/sys/dev/drm2/radeon/radeon_agp.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/drm2/radeon/radeon_agp.c ============================================================================== --- releng/10.0/sys/dev/drm2/radeon/radeon_agp.c Sat Dec 14 00:23:43 2013 (r259366) +++ releng/10.0/sys/dev/drm2/radeon/radeon_agp.c Sat Dec 14 00:25:25 2013 (r259367) @@ -153,11 +153,11 @@ int radeon_agp_init(struct radeon_device return ret; } - if (rdev->ddev->agp->info.ai_aperture_size < 32) { + if ((rdev->ddev->agp->info.ai_aperture_size >> 20) < 32) { drm_agp_release(rdev->ddev); dev_warn(rdev->dev, "AGP aperture too small (%zuM) " "need at least 32M, disabling AGP\n", - rdev->ddev->agp->info.ai_aperture_size); + rdev->ddev->agp->info.ai_aperture_size >> 20); return -EINVAL; } @@ -246,7 +246,7 @@ int radeon_agp_init(struct radeon_device } rdev->mc.agp_base = rdev->ddev->agp->info.ai_aperture_base; - rdev->mc.gtt_size = rdev->ddev->agp->info.ai_aperture_size << 20; + rdev->mc.gtt_size = rdev->ddev->agp->info.ai_aperture_size; rdev->mc.gtt_start = rdev->mc.agp_base; rdev->mc.gtt_end = rdev->mc.gtt_start + rdev->mc.gtt_size - 1; dev_info(rdev->dev, "GTT: %juM 0x%08jX - 0x%08jX\n", From owner-svn-src-releng@FreeBSD.ORG Sat Dec 14 00:40:47 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1756BC5; Sat, 14 Dec 2013 00:40:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CD9A91FF6; Sat, 14 Dec 2013 00:40:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE0el6m005241; Sat, 14 Dec 2013 00:40:47 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE0elv3005240; Sat, 14 Dec 2013 00:40:47 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201312140040.rBE0elv3005240@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sat, 14 Dec 2013 00:40:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259370 - releng/10.0/sys/dev/drm2/radeon X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 00:40:48 -0000 Author: dumbbell Date: Sat Dec 14 00:40:47 2013 New Revision: 259370 URL: http://svnweb.freebsd.org/changeset/base/259370 Log: MFC r259236: drm/radeon: radeon_dp_i2c_aux_ch() must return 0 on FreeBSD The code was unmodified compared to Linux and returned the amount of received bytes from the i2c bus. This led to non-working i2c bus and failure to eg. read monitor's EDID, if connected to DisplayPort. Tested by: Mikaël Urankar Approved by: re (gjb) Modified: releng/10.0/sys/dev/drm2/radeon/atombios_dp.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/drm2/radeon/atombios_dp.c ============================================================================== --- releng/10.0/sys/dev/drm2/radeon/atombios_dp.c Sat Dec 14 00:36:29 2013 (r259369) +++ releng/10.0/sys/dev/drm2/radeon/atombios_dp.c Sat Dec 14 00:40:47 2013 (r259370) @@ -272,7 +272,7 @@ int radeon_dp_i2c_aux_ch(device_t dev, i case AUX_I2C_REPLY_ACK: if (mode == MODE_I2C_READ) *read_byte = reply[0]; - return ret; + return (0); /* Return ret on Linux. */ case AUX_I2C_REPLY_NACK: DRM_DEBUG_KMS("aux_i2c nack\n"); return -EREMOTEIO; From owner-svn-src-releng@FreeBSD.ORG Sat Dec 14 01:01:33 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CBF0DA0; Sat, 14 Dec 2013 01:01:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 38CB5118D; Sat, 14 Dec 2013 01:01:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE11Xv2013432; Sat, 14 Dec 2013 01:01:33 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE11XOj013431; Sat, 14 Dec 2013 01:01:33 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201312140101.rBE11XOj013431@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sat, 14 Dec 2013 01:01:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259376 - releng/10.0/sys/dev/drm2 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 01:01:33 -0000 Author: dumbbell Date: Sat Dec 14 01:01:32 2013 New Revision: 259376 URL: http://svnweb.freebsd.org/changeset/base/259376 Log: MFC r259237: drm: Read PCIER_LINK_CAP/PCIER_LINK_CAP2 from the PCI bridge Before this fix, capabilities were read from vgapci and were incorrect. Approved by: re (gjb) Modified: releng/10.0/sys/dev/drm2/drm_pci.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/drm2/drm_pci.c ============================================================================== --- releng/10.0/sys/dev/drm2/drm_pci.c Sat Dec 14 00:59:40 2013 (r259375) +++ releng/10.0/sys/dev/drm2/drm_pci.c Sat Dec 14 01:01:32 2013 (r259376) @@ -134,7 +134,11 @@ int drm_pcie_get_speed_cap_mask(struct d if (!drm_device_is_pcie(dev)) return -EINVAL; - root = device_get_parent(dev->device); + root = + device_get_parent( /* pcib */ + device_get_parent( /* `-- pci */ + device_get_parent( /* `-- vgapci */ + dev->device))); /* `-- drmn */ pos = 0; pci_find_cap(root, PCIY_EXPRESS, &pos); From owner-svn-src-releng@FreeBSD.ORG Sat Dec 14 11:32:58 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D04F5EB2; Sat, 14 Dec 2013 11:32:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BBDC51B66; Sat, 14 Dec 2013 11:32:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBEBWwwc046625; Sat, 14 Dec 2013 11:32:58 GMT (envelope-from rmh@svn.freebsd.org) Received: (from rmh@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBEBWwII046624; Sat, 14 Dec 2013 11:32:58 GMT (envelope-from rmh@svn.freebsd.org) Message-Id: <201312141132.rBEBWwII046624@svn.freebsd.org> From: Robert Millan Date: Sat, 14 Dec 2013 11:32:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259388 - releng/10.0/sys/dev/drm2/radeon X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 11:32:58 -0000 Author: rmh Date: Sat Dec 14 11:32:58 2013 New Revision: 259388 URL: http://svnweb.freebsd.org/changeset/base/259388 Log: MFC r259003: Initialize modesetting sysctls in radeonkms. Approved by: re (gjb) Modified: releng/10.0/sys/dev/drm2/radeon/radeon_drv.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/drm2/radeon/radeon_drv.c ============================================================================== --- releng/10.0/sys/dev/drm2/radeon/radeon_drv.c Sat Dec 14 04:27:28 2013 (r259387) +++ releng/10.0/sys/dev/drm2/radeon/radeon_drv.c Sat Dec 14 11:32:58 2013 (r259388) @@ -338,6 +338,12 @@ static const struct file_operations rade }; #endif /* DUMBBELL_WIP */ +static int radeon_sysctl_init(struct drm_device *dev, struct sysctl_ctx_list *ctx, + struct sysctl_oid *top) +{ + return drm_add_busid_modesetting(dev, ctx, top); +} + static struct drm_driver_info kms_driver = { .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | @@ -367,6 +373,7 @@ static struct drm_driver_info kms_driver .irq_postinstall = radeon_driver_irq_postinstall_kms, .irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_handler = radeon_driver_irq_handler_kms, + .sysctl_init = radeon_sysctl_init, .ioctls = radeon_ioctls_kms, .gem_init_object = radeon_gem_object_init, .gem_free_object = radeon_gem_object_free,