CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 07:58:50 UTC 2017 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1435, 1436 To generate a diff of this commit: cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.82 src/doc/CHANGES-6.0.7:1.1.2.83 --- src/doc/CHANGES-6.0.7:1.1.2.82 Tue Feb 14 16:58:20 2017 +++ src/doc/CHANGES-6.0.7 Sun Feb 19 07:58:50 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.82 2017/02/14 16:58:20 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.83 2017/02/19 07:58:50 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -9382,3 +9382,920 @@ sys/compat/linux/arch/amd64/linux_machde Don't let userland choose %rip. [maxv, ticket #1433] +external/mit/expat/dist/CMake.READMEup to 1.1.1.3 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.3 +external/mit/expat/dist/COPYING up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.4 +external/mit/expat/dist/MANIFESTup to 1.1.1.4 +external/mit/expat/dist/Makefile.in up to 1.1.1.4 +external/mit/expat/dist/README up to 1.1.1.4 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.3 +external/mit/expat/dist/amiga/expat_lib.c up to 1.1.1.2 +external/mit/expat/dist/amiga/expat_vectors.c up to 1.1.1.2 +external/mit/expat/dist/amiga/launch.c up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/xmlwf.mak up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.4 +external/mit/expat/dist/configure.acup to 1.1.1.2 +external/mit/expat/dist/conftools/config.guess up to 1.3 +external/mit/expat/dist/conftools/config.subup to 1.3 +external/mit/expat/dist/conftools/install-shup to 1.1.1.4 +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.4 +external/mit/expat/dist/doc/expat.png up to 1.1.1.2 +external/mit/expat/dist/doc/valid-xhtml10.png up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.sgml delete +external/mit/expat/dist/doc/xmlwf.xml up to 1.1.1.1 +external/mit/expat/dist/examples/elements.c up to 1.1.1.3 +external/mit/expat/dist/examples/outline.c up to 1.1.1.2 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.4 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expat.h up to 1.1.1.4 +external/mit/expat/dist/lib/expat_external.hup to 1.1.1.2 +external/mit/expat/dist/lib/expat_static.dspup to 1.1.1.3 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expatw_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/internal.h up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.6 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.3 +external/mit/expat/dist/lib/xmltok.cup to 1.3 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.5 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.2 +external/mit/expat/dist/tests/chardata.cup to 1.1.1.3 +external/mit/expat/dist/tests/minicheck.c up to 1.1.1.2 +external/mit/expat/dist/tests/minicheck.h up to 1.1.1.3 +external/mit/expat/dist/tests/runtests.cup to 1.1.1.3 +external/mit/expat/dist/tests/xmltest.shup to 1.2 +external/mit/expat/dist/win32/README.txtup to 1.1.1.3 +external/mit/expat/dist/win32/expat.iss up to 1.1.1.4 +external/mit/expat/dist/xmlwf/codepage.cup to 1.1.1.2 +external/mit/expat/dist/xmlwf/readfilemap.c up to 1.1.1.3 +external/mit/expat/dist/xmlwf/xmlfile.c up to 1.1.1.2 +external/mit/expat/dist/xmlwf/xmlwf.c up to 1.1.1.4 +external/mit/expat/dist/xmlwf/xmlwf.dsp up to 1.1.1.3 +external/mit/expat/lib/libexpat/expat_config.h up to 1.4 + + Update expat to 2.2.0,
CVS commit: src/doc
Module Name:src Committed By: rin Date: Sun Feb 19 07:48:07 UTC 2017 Modified Files: src/doc: CHANGES Log Message: Add DISKLABEL_EI. To generate a diff of this commit: cvs rdiff -u -r1.2255 -r1.2256 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2255 src/doc/CHANGES:1.2256 --- src/doc/CHANGES:1.2255 Fri Feb 17 01:14:31 2017 +++ src/doc/CHANGES Sun Feb 19 07:48:07 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2255 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2256 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -473,3 +473,6 @@ Changes from NetBSD 7.0 to NetBSD 8.0: postfix(1): Import version 3.1.4. [christos 20170213] l2tp(4): Add L2TPv3 interface. [knakahara 20170216] siginfo(2): Add new si_code for SIGTRAP: TRAP_DBREG [kamil 20170217] + disklabel(5): Add DISKLABEL_EI (``Endian-Independent'' disklabel) + kernel option to machines that support Master Boot Record + (MBR). [rin 20170219]
CVS commit: src/sys/arch
Module Name:src Committed By: rin Date: Sun Feb 19 07:47:01 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/bebox/conf: GENERIC INSTALL src/sys/arch/emips/conf: GENERIC INSTALL src/sys/arch/epoc32/conf: GENERIC src/sys/arch/evbarm/conf: ADI_BRH ARMADAXP ARMADILLO-IOT-G3 ARMADILLO210 ARMADILLO9 BCM5301X BCM56340 BEAGLEBOARD BEAGLEBOARDXM BEAGLEBONE CP3100 CUBOX CUBOX-I DUOVERO EXYNOS GEMINI GEMINI_MASTER GEMINI_SLAVE GENERIC.common GOLDENGATE GUMSTIX HAWK HDL_G HPT5325 IGEPV2 IMX23_OLINUXINO IMX31LITE INTEGRATOR INTEGRATOR_CP IQ31244 IQ80310 IQ80321 IXDP425 IXM1200 LUBBOCK MARVELL_NAS MINI2440 MMNET_GENERIC MPCSA_GENERIC MV2120 N900 NAPPI NITROGEN6X NSLU2 ODROID-U ODROID-XU OMAP5EVM OPENBLOCKS_A6 OPENBLOCKS_AX3 OSK5912 OVERO PANDABOARD PEPPER SHEEVAPLUG SMDK2410 SMDK2800 TEAMASA_NPWR TEAMASA_NPWR_FC TISDP2420 TISDP2430 TS7200 TWINTAIL VEXPRESS_A15 VIPER VTC100 ZAO425 src/sys/arch/evbarm64/conf: A64EMUL src/sys/arch/evbmips/conf: ADM5120 ADM5120-NB ADM5120-USB CI20 CPMBR1400 ERLITE GDIUM LINKITSMART7688 LOONGSON RB153 ZYXELKX src/sys/arch/evbppc/conf: MPC8536DS MPC8548CDS OPENBLOCKS600 P2020DS P2020RDB PMPPC RB800 RB850GX2 TWRP1025 src/sys/arch/i386/conf: ALL GENERIC GENERIC_PS2TINY GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY NET4501 XEN3_DOM0 XEN3_DOMU src/sys/arch/ibmnws/conf: GENERIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/mvmeppc/conf: GENERIC src/sys/arch/prep/conf: GENERIC INSTALL INSTALL_SMALL src/sys/arch/riscv/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/sandpoint/conf: ENCPP1 GENERIC SANDPOINT src/sys/arch/usermode/conf: GENERIC.common src/sys/arch/zaurus/conf: GENERIC Log Message: PR kern/51208 Add DISKLABEL_EI option (and also FFS_EI if missing), commented out except for ALL on amd64 and i386. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.451 -r1.452 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.128 -r1.129 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.152 -r1.153 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/bebox/conf/INSTALL cvs rdiff -u -r1.17 -r1.18 src/sys/arch/emips/conf/GENERIC cvs rdiff -u -r1.6 -r1.7 src/sys/arch/emips/conf/INSTALL cvs rdiff -u -r1.12 -r1.13 src/sys/arch/epoc32/conf/GENERIC cvs rdiff -u -r1.70 -r1.71 src/sys/arch/evbarm/conf/ADI_BRH \ src/sys/arch/evbarm/conf/IQ31244 cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/ARMADAXP cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/ARMADILLO210 cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/conf/ARMADILLO9 \ src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/BCM56340 \ src/sys/arch/evbarm/conf/VTC100 cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/conf/BEAGLEBOARD cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/BEAGLEBOARDXM \ src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/BEAGLEBONE cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/CP3100 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/CUBOX cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/CUBOX-I cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/DUOVERO cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/EXYNOS \ src/sys/arch/evbarm/conf/INTEGRATOR_CP cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/GEMINI \ src/sys/arch/evbarm/conf/GEMINI_MASTER cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/GEMINI_SLAVE \ src/sys/arch/evbarm/conf/TISDP2430 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/GENERIC.common cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/GOLDENGATE cvs rdiff -u -r1.89 -r1.90 src/sys/arch/evbarm/conf/GUMSTIX \ src/sys/arch/evbarm/conf/TEAMASA_NPWR cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/HAWK \ src/sys/arch/evbarm/conf/ODROID-XU src/sys/arch/evbarm/conf/VEXPRESS_A15 cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/HDL_G \ src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/HPT5325 \ src/sys/arch/evbarm/conf/IMX31LITE src/sys/arch/evbarm/conf/MV2120 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/IGEPV2 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/IMX23_OLINUXINO cvs rdiff -u -r1.80 -r1.81 src/sys/arch/evbarm/conf/INTEGRATOR cvs rdiff -u -r1.88 -r1.89 src/sys/arch/evbarm/conf/IQ80310 cvs rdiff -u -r1.85 -r1.86 src/sys/arch/evbarm/conf/IQ80321 cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/IXDP425
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 07:44:21 UTC 2017 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: 1360 To generate a diff of this commit: cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.152 src/doc/CHANGES-7.1:1.1.2.153 --- src/doc/CHANGES-7.1:1.1.2.152 Sun Feb 19 05:04:20 2017 +++ src/doc/CHANGES-7.1 Sun Feb 19 07:44:21 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.152 2017/02/19 05:04:20 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.153 2017/02/19 07:44:21 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -8771,3 +8771,8 @@ external/bsd/tcpdump/include/config.h CVE-2017-5484 CVE-2017-5485 CVE-2017-5486 [spz, ticket #1362] +etc/etc.luna68k/MAKEDEV.conf 1.10 + + Make sure to prepare /dev/xp node entry. + [tsutsui, ticket #1360] +
CVS commit: [netbsd-7] src/etc/etc.luna68k
Module Name:src Committed By: snj Date: Sun Feb 19 07:42:37 UTC 2017 Modified Files: src/etc/etc.luna68k [netbsd-7]: MAKEDEV.conf Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1360): etc/etc.luna68k/MAKEDEV.conf: revision 1.10 Make sure to prepare /dev/xp node entry. Missed in the initial xp(4) support import: http://mail-index.netbsd.org/source-changes/2016/12/03/msg079493.html To generate a diff of this commit: cvs rdiff -u -r1.8.10.1 -r1.8.10.2 src/etc/etc.luna68k/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.luna68k/MAKEDEV.conf diff -u src/etc/etc.luna68k/MAKEDEV.conf:1.8.10.1 src/etc/etc.luna68k/MAKEDEV.conf:1.8.10.2 --- src/etc/etc.luna68k/MAKEDEV.conf:1.8.10.1 Tue Dec 6 06:50:23 2016 +++ src/etc/etc.luna68k/MAKEDEV.conf Sun Feb 19 07:42:37 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.8.10.1 2016/12/06 06:50:23 snj Exp $ +# $NetBSD: MAKEDEV.conf,v 1.8.10.2 2017/02/19 07:42:37 snj Exp $ all_md) makedev ttya sd0 sd1 sd2 sd3 cd0 cd1 st0 st1 @@ -21,3 +21,8 @@ ramdisk) makedev ttyEcfg ttyE0 wskbd0 makedev scsibus0 scsibus1 ;; + +xp) + major=40; minor=0; mode=0644 + mkdev xp c $major $minor $mode + ;;
CVS commit: src
Module Name:src
Committed By: rin
Date: Sun Feb 19 07:43:42 UTC 2017
Modified Files:
src/share/man/man4: options.4
src/sys/kern: subr_disk_mbr.c
Log Message:
PR kern/51208
Add DISKLABEL_EI (``Endian-Independent'' disklabel) kernel option to machines
that support Master Boot Record (MBR)
To generate a diff of this commit:
cvs rdiff -u -r1.461 -r1.462 src/share/man/man4/options.4
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/subr_disk_mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.461 src/share/man/man4/options.4:1.462
--- src/share/man/man4/options.4:1.461 Mon Feb 13 09:46:29 2017
+++ src/share/man/man4/options.4 Sun Feb 19 07:43:42 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.461 2017/02/13 09:46:29 skrll Exp $
+.\" $NetBSD: options.4,v 1.462 2017/02/19 07:43:42 rin Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd January 8, 2017
+.Dd February 19, 2017
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -971,6 +971,33 @@ This enables for example sshfs:
.El
.Ss File System Options
.Bl -ohang
+.It Cd options DISKLABEL_EI
+Enable
+.Dq Endian-Independent
+.Xr disklabel 5
+support.
+This allows a system to recognize a disklabel written in the other byte order.
+For writing, when a label already exists, its byte order is preserved.
+Otherwise, a new label is written in the native byte order.
+To specify the byte order explicitly,
+.Fl F
+option of
+.Xr disklabel 8
+should be used with
+.Fl B
+option in order to avoid using
+.Xr ioctl 2 ,
+which results in the default behavior explained above.
+At the moment this option is restricted to the following ports:
+amd64, bebox, emips, epoc32, evbarm, i386, ibmnws, landisk, mvmeppc, prep,
+.\" riscv,
+rs6000, sandpoint,
+.\" usermode,
+xen, and zaurus.
+And to machines of
+.\" evbarm64,
+evbmips and evbppc ports that support
+Master Boot Record (MBR).
.It Cd options MAGICLINKS
Enables the expansion of special strings
.Po
Index: src/sys/kern/subr_disk_mbr.c
diff -u src/sys/kern/subr_disk_mbr.c:1.46 src/sys/kern/subr_disk_mbr.c:1.47
--- src/sys/kern/subr_disk_mbr.c:1.46 Wed Jun 26 18:47:26 2013
+++ src/sys/kern/subr_disk_mbr.c Sun Feb 19 07:43:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_mbr.c,v 1.46 2013/06/26 18:47:26 matt Exp $ */
+/* $NetBSD: subr_disk_mbr.c,v 1.47 2017/02/19 07:43:42 rin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.46 2013/06/26 18:47:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.47 2017/02/19 07:43:42 rin Exp $");
#include
#include
@@ -117,6 +117,10 @@ static int validate_label(mbr_args_t *,
static int look_netbsd_part(mbr_args_t *, mbr_partition_t *, int, uint);
static int write_netbsd_label(mbr_args_t *, mbr_partition_t *, int, uint);
+#ifdef DISKLABEL_EI
+static void swap_disklabel(struct disklabel *, struct disklabel *);
+#endif
+
static int
read_sector(mbr_args_t *a, uint sector, int count)
{
@@ -565,12 +569,23 @@ look_netbsd_part(mbr_args_t *a, mbr_part
}
+#ifdef DISKLABEL_EI
+/*
+ * - For read, convert a label to the native byte order.
+ * - For update or write, if a label already exists, keep its byte order.
+ * Otherwise, write a new label in the native byte order.
+ */
+#endif
static int
validate_label(mbr_args_t *a, uint label_sector)
{
struct disklabel *dlp;
char *dlp_lim, *dlp_byte;
int error;
+#ifdef DISKLABEL_EI
+ int swapped = 0;
+ uint16_t npartitions;
+#endif
/* Next, dig out disk label */
if (read_sector(a, label_sector, SCANBLOCKS)) {
@@ -603,8 +618,31 @@ validate_label(mbr_args_t *a, uint label
break;
}
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC)
+#ifdef DISKLABEL_EI
+ {
+ if (bswap32(dlp->d_magic) != DISKMAGIC ||
+ bswap32(dlp->d_magic2) != DISKMAGIC)
+continue;
+
+ /*
+ * The label is in the other byte order. We need to
+ * checksum before swapping the byte order.
+ */
+ npartitions = bswap16(dlp->d_npartitions);
+ if (npartitions > MAXPARTITIONS ||
+ dkcksum_sized(dlp, npartitions) != 0)
+goto corrupted;
+
+ swapped = 1;
+ }
+#else
continue;
- if (dlp->d_npartitions > MAXPARTITIONS || dkcksum(dlp) != 0) {
+#endif
+ else if (dlp->d_npartitions > MAXPARTITIONS ||
+ dkcksum(dlp) != 0) {
+#ifdef DISKLABEL_EI
+corrupted:
+#endif
a->msg = "disk label corrupted";
continue;
}
@@ -613,7 +651,14 @@ validate_label(mbr_args_t *a, uint label
switch (a->action) {
case READ_LABEL:
+#ifdef DISKLABEL_EI
+ if (swapped)
+ swap_disklabel(a->lp, dlp);
+ else
+ *a->lp = *dlp;
+#else
*a->lp = *dlp;
+#endif
if ((a->msg =
CVS commit: [netbsd-6] src
Module Name:src Committed By: snj Date: Sun Feb 19 07:37:18 UTC 2017 Modified Files: src/doc [netbsd-6]: 3RDPARTY src/external/bsd/tcpdump/bin [netbsd-6]: Makefile src/external/bsd/tcpdump/dist [netbsd-6]: CHANGES CREDITS INSTALL.txt Makefile-devel-adds Makefile.in README VERSION aclocal.m4 addrtoname.c addrtoname.h af.c af.h ah.h appletalk.h atm.h bpf_dump.c chdlc.h checksum.c config.guess config.h.in config.sub configure configure.in cpack.c cpack.h ether.h ethertype.h extract.h gmpls.c gmpls.h gmt2local.c gmt2local.h install-sh interface.h ip.h ip6.h ipproto.c ipproto.h l2vpn.c l2vpn.h llc.h machdep.c machdep.h makemib mib.h mkdep mpls.h nameser.h netdissect.h nfs.h nfsfh.h nlpid.c nlpid.h ospf.h oui.c oui.h parsenfsfh.c pcap-missing.h pcap_dump_ftell.c ppp.h print-802_11.c print-ah.c print-aodv.c print-ap1394.c print-arcnet.c print-arp.c print-ascii.c print-atalk.c print-atm.c print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c print-dhcp6.c print-domain.c print-dtp.c print-dvmrp.c print-eap.c print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c print-frag6.c print-gre.c print-hsrp.c print-icmp.c print-icmp6.c print-igmp.c print-igrp.c print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c print-ipnet.c print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c print-llc.c print-lldp.c print-lmp.c print-lspping.c print-lwapp.c print-lwres.c print-mobile.c print-mobility.c print-mpcp.c print-mpls.c print-msdp.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c print-ospf6.c print-pflog.c print-pfsync.c print-pgm.c print-pim.c print-ppp.c print-pppoe.c print-pptp.c print-radius.c print-raw.c print-rip.c print-ripng.c print-rrcp.c print-rsvp.c print-rt6.c print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c print-timed.c print-token.c print-udld.c print-udp.c print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-wb.c print-zephyr.c rpc_auth.h rpc_msg.h setsignal.c setsignal.h signature.c signature.h slcompress.h smb.h smbutil.c tcp.h tcpdump.1.in tcpdump.c udp.h vfprintf.c src/external/bsd/tcpdump/dist/lbl [netbsd-6]: os-osf4.h os-solaris2.h os-sunos4.h os-ultrix4.h src/external/bsd/tcpdump/dist/missing [netbsd-6]: datalinks.c dlnames.c snprintf.c strdup.c strlcat.c strlcpy.c strsep.c src/external/bsd/tcpdump/dist/tests [netbsd-6]: TESTLIST TESTonce TESTrun.sh bgp_vpn_attrset.out forces1.out forces1.pcap forces1vvv.out forces1.out forces2vv.out ikev2fourv.out ikev2fourv4.out lmp.out print-A.out print-AA.out print-capX.out print-capXX.out print-x.out print-xx.out src/external/bsd/tcpdump/dist/win32/prj [netbsd-6]: GNUmakefile WinDump.dsp src/external/bsd/tcpdump/include [netbsd-6]: config.h Added Files: src/external/bsd/tcpdump [netbsd-6]: tcpdump2netbsd src/external/bsd/tcpdump/dist [netbsd-6]: CONTRIBUTING PLATFORMS README.md addrtostr.c addrtostr.h ascii_strcasecmp.c ascii_strcasecmp.h getopt_long.h in_cksum.c netdissect-stdinc.h netdissect.c openflow.h print-802_15_4.c print-ahcp.c print-aoe.c print-babel.c print-calm-fast.c print-carp.c print-ftp.c print-geneve.c print-geonet.c print-hncp.c print-http.c print-lisp.c print-loopback.c print-m3ua.c print-medsa.c print-mptcp.c print-msnlb.c print-nflog.c print-nsh.c print-openflow-1.0.c print-openflow.c print-otv.c print-pktap.c print-ppi.c print-resp.c print-rpki-rtr.c print-rtsp.c print-smtp.c print-tipc.c print-vxlan-gpe.c print-vxlan.c print-zeromq.c print.c print.h rpl.h strtoaddr.c strtoaddr.h timeval-operations.h util-print.c src/external/bsd/tcpdump/dist/missing [netbsd-6]: getopt_long.c src/external/bsd/tcpdump/dist/tests [netbsd-6]: 02-sunrise-sunset-esp.pcap 08-sunrise-sunset-aes.pcap 08-sunrise-sunset-esp2.pcap 3560_CDP.pcap 802.1D_spanning_tree.pcap 802.1w_rapid_STP.pcap AoE_Linux.pcap DECnet_Phone.pcap DTP.pcap EIGRP_adjacency.pcap
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: snj Date: Sun Feb 19 07:36:28 UTC 2017 Modified Files: src/doc [netbsd-6-1]: 3RDPARTY src/external/bsd/tcpdump/bin [netbsd-6-1]: Makefile src/external/bsd/tcpdump/dist [netbsd-6-1]: CHANGES CREDITS INSTALL.txt Makefile-devel-adds Makefile.in README VERSION aclocal.m4 addrtoname.c addrtoname.h af.c af.h ah.h appletalk.h atm.h bpf_dump.c chdlc.h checksum.c config.guess config.h.in config.sub configure configure.in cpack.c cpack.h ether.h ethertype.h extract.h gmpls.c gmpls.h gmt2local.c gmt2local.h install-sh interface.h ip.h ip6.h ipproto.c ipproto.h l2vpn.c l2vpn.h llc.h machdep.c machdep.h makemib mib.h mkdep mpls.h nameser.h netdissect.h nfs.h nfsfh.h nlpid.c nlpid.h ospf.h oui.c oui.h parsenfsfh.c pcap-missing.h pcap_dump_ftell.c ppp.h print-802_11.c print-ah.c print-aodv.c print-ap1394.c print-arcnet.c print-arp.c print-ascii.c print-atalk.c print-atm.c print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c print-dhcp6.c print-domain.c print-dtp.c print-dvmrp.c print-eap.c print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c print-frag6.c print-gre.c print-hsrp.c print-icmp.c print-icmp6.c print-igmp.c print-igrp.c print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c print-ipnet.c print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c print-llc.c print-lldp.c print-lmp.c print-lspping.c print-lwapp.c print-lwres.c print-mobile.c print-mobility.c print-mpcp.c print-mpls.c print-msdp.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c print-ospf6.c print-pflog.c print-pfsync.c print-pgm.c print-pim.c print-ppp.c print-pppoe.c print-pptp.c print-radius.c print-raw.c print-rip.c print-ripng.c print-rrcp.c print-rsvp.c print-rt6.c print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c print-timed.c print-token.c print-udld.c print-udp.c print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-wb.c print-zephyr.c rpc_auth.h rpc_msg.h setsignal.c setsignal.h signature.c signature.h slcompress.h smb.h smbutil.c tcp.h tcpdump.1.in tcpdump.c udp.h vfprintf.c src/external/bsd/tcpdump/dist/lbl [netbsd-6-1]: os-osf4.h os-solaris2.h os-sunos4.h os-ultrix4.h src/external/bsd/tcpdump/dist/missing [netbsd-6-1]: datalinks.c dlnames.c snprintf.c strdup.c strlcat.c strlcpy.c strsep.c src/external/bsd/tcpdump/dist/tests [netbsd-6-1]: TESTLIST TESTonce TESTrun.sh bgp_vpn_attrset.out forces1.out forces1.pcap forces1vvv.out forces1.out forces2vv.out ikev2fourv.out ikev2fourv4.out lmp.out print-A.out print-AA.out print-capX.out print-capXX.out print-x.out print-xx.out src/external/bsd/tcpdump/dist/win32/prj [netbsd-6-1]: GNUmakefile WinDump.dsp src/external/bsd/tcpdump/include [netbsd-6-1]: config.h Added Files: src/external/bsd/tcpdump [netbsd-6-1]: tcpdump2netbsd src/external/bsd/tcpdump/dist [netbsd-6-1]: CONTRIBUTING PLATFORMS README.md addrtostr.c addrtostr.h ascii_strcasecmp.c ascii_strcasecmp.h getopt_long.h in_cksum.c netdissect-stdinc.h netdissect.c openflow.h print-802_15_4.c print-ahcp.c print-aoe.c print-babel.c print-calm-fast.c print-carp.c print-ftp.c print-geneve.c print-geonet.c print-hncp.c print-http.c print-lisp.c print-loopback.c print-m3ua.c print-medsa.c print-mptcp.c print-msnlb.c print-nflog.c print-nsh.c print-openflow-1.0.c print-openflow.c print-otv.c print-pktap.c print-ppi.c print-resp.c print-rpki-rtr.c print-rtsp.c print-smtp.c print-tipc.c print-vxlan-gpe.c print-vxlan.c print-zeromq.c print.c print.h rpl.h strtoaddr.c strtoaddr.h timeval-operations.h util-print.c src/external/bsd/tcpdump/dist/missing [netbsd-6-1]: getopt_long.c src/external/bsd/tcpdump/dist/tests [netbsd-6-1]: 02-sunrise-sunset-esp.pcap 08-sunrise-sunset-aes.pcap 08-sunrise-sunset-esp2.pcap 3560_CDP.pcap 802.1D_spanning_tree.pcap 802.1w_rapid_STP.pcap AoE_Linux.pcap DECnet_Phone.pcap DTP.pcap
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: snj Date: Sun Feb 19 07:35:31 UTC 2017 Modified Files: src/doc [netbsd-6-0]: 3RDPARTY src/external/bsd/tcpdump/bin [netbsd-6-0]: Makefile src/external/bsd/tcpdump/dist [netbsd-6-0]: CHANGES CREDITS INSTALL.txt Makefile-devel-adds Makefile.in README VERSION aclocal.m4 addrtoname.c addrtoname.h af.c af.h ah.h appletalk.h atm.h bpf_dump.c chdlc.h checksum.c config.guess config.h.in config.sub configure configure.in cpack.c cpack.h ether.h ethertype.h extract.h gmpls.c gmpls.h gmt2local.c gmt2local.h install-sh interface.h ip.h ip6.h ipproto.c ipproto.h l2vpn.c l2vpn.h llc.h machdep.c machdep.h makemib mib.h mkdep mpls.h nameser.h netdissect.h nfs.h nfsfh.h nlpid.c nlpid.h ospf.h oui.c oui.h parsenfsfh.c pcap-missing.h pcap_dump_ftell.c ppp.h print-802_11.c print-ah.c print-aodv.c print-ap1394.c print-arcnet.c print-arp.c print-ascii.c print-atalk.c print-atm.c print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c print-dhcp6.c print-domain.c print-dtp.c print-dvmrp.c print-eap.c print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c print-frag6.c print-gre.c print-hsrp.c print-icmp.c print-icmp6.c print-igmp.c print-igrp.c print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c print-ipnet.c print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c print-llc.c print-lldp.c print-lmp.c print-lspping.c print-lwapp.c print-lwres.c print-mobile.c print-mobility.c print-mpcp.c print-mpls.c print-msdp.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c print-ospf6.c print-pflog.c print-pfsync.c print-pgm.c print-pim.c print-ppp.c print-pppoe.c print-pptp.c print-radius.c print-raw.c print-rip.c print-ripng.c print-rrcp.c print-rsvp.c print-rt6.c print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c print-timed.c print-token.c print-udld.c print-udp.c print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-wb.c print-zephyr.c rpc_auth.h rpc_msg.h setsignal.c setsignal.h signature.c signature.h slcompress.h smb.h smbutil.c tcp.h tcpdump.1.in tcpdump.c udp.h vfprintf.c src/external/bsd/tcpdump/dist/lbl [netbsd-6-0]: os-osf4.h os-solaris2.h os-sunos4.h os-ultrix4.h src/external/bsd/tcpdump/dist/missing [netbsd-6-0]: datalinks.c dlnames.c snprintf.c strdup.c strlcat.c strlcpy.c strsep.c src/external/bsd/tcpdump/dist/tests [netbsd-6-0]: TESTLIST TESTonce TESTrun.sh bgp_vpn_attrset.out forces1.out forces1.pcap forces1vvv.out forces1.out forces2vv.out ikev2fourv.out ikev2fourv4.out lmp.out print-A.out print-AA.out print-capX.out print-capXX.out print-x.out print-xx.out src/external/bsd/tcpdump/dist/win32/prj [netbsd-6-0]: GNUmakefile WinDump.dsp src/external/bsd/tcpdump/include [netbsd-6-0]: config.h Added Files: src/external/bsd/tcpdump [netbsd-6-0]: tcpdump2netbsd src/external/bsd/tcpdump/dist [netbsd-6-0]: CONTRIBUTING PLATFORMS README.md addrtostr.c addrtostr.h ascii_strcasecmp.c ascii_strcasecmp.h getopt_long.h in_cksum.c netdissect-stdinc.h netdissect.c openflow.h print-802_15_4.c print-ahcp.c print-aoe.c print-babel.c print-calm-fast.c print-carp.c print-ftp.c print-geneve.c print-geonet.c print-hncp.c print-http.c print-lisp.c print-loopback.c print-m3ua.c print-medsa.c print-mptcp.c print-msnlb.c print-nflog.c print-nsh.c print-openflow-1.0.c print-openflow.c print-otv.c print-pktap.c print-ppi.c print-resp.c print-rpki-rtr.c print-rtsp.c print-smtp.c print-tipc.c print-vxlan-gpe.c print-vxlan.c print-zeromq.c print.c print.h rpl.h strtoaddr.c strtoaddr.h timeval-operations.h util-print.c src/external/bsd/tcpdump/dist/missing [netbsd-6-0]: getopt_long.c src/external/bsd/tcpdump/dist/tests [netbsd-6-0]: 02-sunrise-sunset-esp.pcap 08-sunrise-sunset-aes.pcap 08-sunrise-sunset-esp2.pcap 3560_CDP.pcap 802.1D_spanning_tree.pcap 802.1w_rapid_STP.pcap AoE_Linux.pcap DECnet_Phone.pcap DTP.pcap
CVS commit: [netbsd-6] src/external/mit/expat
Module Name:src Committed By: snj Date: Sun Feb 19 07:28:12 UTC 2017 Modified Files: src/external/mit/expat/dist [netbsd-6]: CMake.README CMakeLists.txt COPYING Changes MANIFEST Makefile.in README aclocal.m4 configure configure.ac expat_config.h.in src/external/mit/expat/dist/amiga [netbsd-6]: expat_lib.c expat_vectors.c launch.c src/external/mit/expat/dist/bcb5 [netbsd-6]: expat.bpr expat.mak expat_static.bpr expat_static.mak expatw.bpr expatw.mak expatw_static.bpr expatw_static.mak xmlwf.bpr xmlwf.mak src/external/mit/expat/dist/conftools [netbsd-6]: config.guess config.sub install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-6]: expat.png valid-xhtml10.png xmlwf.1 src/external/mit/expat/dist/examples [netbsd-6]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-6]: expat.dsp expat.h expat_external.h expat_static.dsp expatw.dsp expatw_static.dsp internal.h xmlparse.c xmlrole.c xmltok.c xmltok_impl.c src/external/mit/expat/dist/m4 [netbsd-6]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/dist/tests [netbsd-6]: chardata.c minicheck.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/win32 [netbsd-6]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-6]: codepage.c readfilemap.c xmlfile.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-6]: expat_config.h Added Files: src/external/mit/expat/dist/doc [netbsd-6]: xmlwf.xml Removed Files: src/external/mit/expat/dist/doc [netbsd-6]: xmlwf.sgml Log Message: Pull up following revision(s) (requested by spz in ticket #1435): external/mit/expat/dist/CMake.README: up to 1.1.1.3 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3 external/mit/expat/dist/COPYING: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.4 external/mit/expat/dist/MANIFEST: up to 1.1.1.4 external/mit/expat/dist/Makefile.in: up to 1.1.1.4 external/mit/expat/dist/README: up to 1.1.1.4 external/mit/expat/dist/aclocal.m4: up to 1.1.1.3 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.4 external/mit/expat/dist/configure.ac: up to 1.1.1.2 external/mit/expat/dist/conftools/config.guess: up to 1.3 external/mit/expat/dist/conftools/config.sub: up to 1.3 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4 external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4 external/mit/expat/dist/doc/expat.png: up to 1.1.1.2 external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.sgml delete external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1 external/mit/expat/dist/examples/elements.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.c: up to 1.1.1.2 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expat.h: up to 1.1.1.4 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/internal.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.6 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3 external/mit/expat/dist/lib/xmltok.c: up to 1.3 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3
CVS commit: [netbsd-6-1] src/external/mit/expat
Module Name:src Committed By: snj Date: Sun Feb 19 07:26:20 UTC 2017 Modified Files: src/external/mit/expat/dist [netbsd-6-1]: CMake.README CMakeLists.txt COPYING Changes MANIFEST Makefile.in README aclocal.m4 configure configure.ac expat_config.h.in src/external/mit/expat/dist/amiga [netbsd-6-1]: expat_lib.c expat_vectors.c launch.c src/external/mit/expat/dist/bcb5 [netbsd-6-1]: expat.bpr expat.mak expat_static.bpr expat_static.mak expatw.bpr expatw.mak expatw_static.bpr expatw_static.mak xmlwf.bpr xmlwf.mak src/external/mit/expat/dist/conftools [netbsd-6-1]: config.guess config.sub install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-6-1]: expat.png valid-xhtml10.png xmlwf.1 src/external/mit/expat/dist/examples [netbsd-6-1]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-6-1]: expat.dsp expat.h expat_external.h expat_static.dsp expatw.dsp expatw_static.dsp internal.h xmlparse.c xmlrole.c xmltok.c xmltok_impl.c src/external/mit/expat/dist/m4 [netbsd-6-1]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/dist/tests [netbsd-6-1]: chardata.c minicheck.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/win32 [netbsd-6-1]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-6-1]: codepage.c readfilemap.c xmlfile.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-6-1]: expat_config.h Added Files: src/external/mit/expat/dist/doc [netbsd-6-1]: xmlwf.xml Removed Files: src/external/mit/expat/dist/doc [netbsd-6-1]: xmlwf.sgml Log Message: Pull up following revision(s) (requested by spz in ticket #1435): external/mit/expat/dist/CMake.README: up to 1.1.1.3 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3 external/mit/expat/dist/COPYING: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.4 external/mit/expat/dist/MANIFEST: up to 1.1.1.4 external/mit/expat/dist/Makefile.in: up to 1.1.1.4 external/mit/expat/dist/README: up to 1.1.1.4 external/mit/expat/dist/aclocal.m4: up to 1.1.1.3 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.4 external/mit/expat/dist/configure.ac: up to 1.1.1.2 external/mit/expat/dist/conftools/config.guess: up to 1.3 external/mit/expat/dist/conftools/config.sub: up to 1.3 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4 external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4 external/mit/expat/dist/doc/expat.png: up to 1.1.1.2 external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.sgml delete external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1 external/mit/expat/dist/examples/elements.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.c: up to 1.1.1.2 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expat.h: up to 1.1.1.4 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/internal.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.6 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3 external/mit/expat/dist/lib/xmltok.c: up to 1.3 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2
CVS commit: [netbsd-6-0] src/external/mit/expat
Module Name:src Committed By: snj Date: Sun Feb 19 07:25:37 UTC 2017 Modified Files: src/external/mit/expat/dist [netbsd-6-0]: CMake.README CMakeLists.txt COPYING Changes MANIFEST Makefile.in README aclocal.m4 configure configure.ac expat_config.h.in src/external/mit/expat/dist/amiga [netbsd-6-0]: expat_lib.c expat_vectors.c launch.c src/external/mit/expat/dist/bcb5 [netbsd-6-0]: expat.bpr expat.mak expat_static.bpr expat_static.mak expatw.bpr expatw.mak expatw_static.bpr expatw_static.mak xmlwf.bpr xmlwf.mak src/external/mit/expat/dist/conftools [netbsd-6-0]: config.guess config.sub install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-6-0]: expat.png valid-xhtml10.png xmlwf.1 src/external/mit/expat/dist/examples [netbsd-6-0]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-6-0]: expat.dsp expat.h expat_external.h expat_static.dsp expatw.dsp expatw_static.dsp internal.h xmlparse.c xmlrole.c xmltok.c xmltok_impl.c src/external/mit/expat/dist/m4 [netbsd-6-0]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/dist/tests [netbsd-6-0]: chardata.c minicheck.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/win32 [netbsd-6-0]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-6-0]: codepage.c readfilemap.c xmlfile.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-6-0]: expat_config.h Added Files: src/external/mit/expat/dist/doc [netbsd-6-0]: xmlwf.xml Removed Files: src/external/mit/expat/dist/doc [netbsd-6-0]: xmlwf.sgml Log Message: Pull up following revision(s) (requested by spz in ticket #1435): external/mit/expat/dist/CMake.README: up to 1.1.1.3 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3 external/mit/expat/dist/COPYING: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.4 external/mit/expat/dist/MANIFEST: up to 1.1.1.4 external/mit/expat/dist/Makefile.in: up to 1.1.1.4 external/mit/expat/dist/README: up to 1.1.1.4 external/mit/expat/dist/aclocal.m4: up to 1.1.1.3 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.4 external/mit/expat/dist/configure.ac: up to 1.1.1.2 external/mit/expat/dist/conftools/config.guess: up to 1.3 external/mit/expat/dist/conftools/config.sub: up to 1.3 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4 external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4 external/mit/expat/dist/doc/expat.png: up to 1.1.1.2 external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.sgml delete external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1 external/mit/expat/dist/examples/elements.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.c: up to 1.1.1.2 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expat.h: up to 1.1.1.4 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/internal.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.6 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3 external/mit/expat/dist/lib/xmltok.c: up to 1.3 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 05:04:20 UTC 2017 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: tickets 1361 and 1362 To generate a diff of this commit: cvs rdiff -u -r1.1.2.151 -r1.1.2.152 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.151 src/doc/CHANGES-7.1:1.1.2.152 --- src/doc/CHANGES-7.1:1.1.2.151 Tue Feb 14 16:54:50 2017 +++ src/doc/CHANGES-7.1 Sun Feb 19 05:04:20 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.151 2017/02/14 16:54:50 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.152 2017/02/19 05:04:20 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -7989,3 +7989,785 @@ sys/compat/linux/arch/amd64/linux_machde Don't let userland choose %rip. [maxv, ticket #1359] +doc/3RDPARTY 1.398, 1.407 +external/mit/expat/dist/CMake.READMEup to 1.1.1.3 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.3 +external/mit/expat/dist/COPYING up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.4 +external/mit/expat/dist/MANIFESTup to 1.1.1.4 +external/mit/expat/dist/Makefile.in up to 1.1.1.4 +external/mit/expat/dist/README up to 1.1.1.4 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/xmlwf.mak up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.4 +external/mit/expat/dist/configure.acup to 1.1.1.2 +external/mit/expat/dist/conftools/config.guess up to 1.3 +external/mit/expat/dist/conftools/config.subup to 1.3 +external/mit/expat/dist/conftools/install-shup to 1.1.1.4 +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.4 +external/mit/expat/dist/doc/expat.png up to 1.1.1.2 +external/mit/expat/dist/doc/valid-xhtml10.png up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.sgml delete +external/mit/expat/dist/doc/xmlwf.xml up to 1.1.1.1 +external/mit/expat/dist/examples/elements.c up to 1.1.1.3 +external/mit/expat/dist/examples/outline.c up to 1.1.1.2 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.4 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expat.h up to 1.1.1.4 +external/mit/expat/dist/lib/expat_external.hup to 1.1.1.2 +external/mit/expat/dist/lib/expat_static.dspup to 1.1.1.3 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expatw_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/internal.h up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.6 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.3 +external/mit/expat/dist/lib/xmltok.cup to 1.3 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.5 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.2 +external/mit/expat/dist/tests/chardata.cup to 1.1.1.3 +external/mit/expat/dist/tests/minicheck.c up to 1.1.1.2 +external/mit/expat/dist/tests/minicheck.h up to 1.1.1.3 +external/mit/expat/dist/tests/runtests.cup to 1.1.1.3 +external/mit/expat/dist/tests/xmltest.shup to 1.2 +external/mit/expat/dist/win32/README.txtup to 1.1.1.3 +external/mit/expat/dist/win32/expat.iss up to 1.1.1.4 +external/mit/expat/dist/xmlwf/codepage.cup to 1.1.1.2 +external/mit/expat/dist/xmlwf/readfilemap.c up to 1.1.1.3 +external/mit/expat/dist/xmlwf/xmlfile.c up to 1.1.1.2 +external/mit/expat/dist/xmlwf/xmlwf.c up to 1.1.1.4 +external/mit/expat/dist/xmlwf/xmlwf.dsp up to 1.1.1.3 +external/mit/expat/lib/libexpat/expat_config.h up to 1.4 + + Update expat to 2.2.0, fixing CVE-2016-0718, CVE-2016-4472, + CVE-2016-5300, and CVE-2012-6702. + [spz, ticket #1361] + +doc/3RDPARTY patch +external/bsd/tcpdump/bin/Makefile
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: snj Date: Sun Feb 19 05:03:40 UTC 2017 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: tickets 1361 and 1362 To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.26 src/doc/CHANGES-7.0.3:1.1.2.27 --- src/doc/CHANGES-7.0.3:1.1.2.26 Tue Feb 14 16:56:05 2017 +++ src/doc/CHANGES-7.0.3 Sun Feb 19 05:03:40 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.26 2017/02/14 16:56:05 snj Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.27 2017/02/19 05:03:40 snj Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -375,3 +375,785 @@ sys/compat/linux/arch/amd64/linux_machde Don't let userland choose %rip. [maxv, ticket #1359] +doc/3RDPARTY 1.398, 1.407 +external/mit/expat/dist/CMake.READMEup to 1.1.1.3 +external/mit/expat/dist/CMakeLists.txt up to 1.1.1.3 +external/mit/expat/dist/COPYING up to 1.1.1.2 +external/mit/expat/dist/Changes up to 1.1.1.4 +external/mit/expat/dist/MANIFESTup to 1.1.1.4 +external/mit/expat/dist/Makefile.in up to 1.1.1.4 +external/mit/expat/dist/README up to 1.1.1.4 +external/mit/expat/dist/aclocal.m4 up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expat_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expat_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/expatw_static.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/expatw_static.mak up to 1.1.1.2 +external/mit/expat/dist/bcb5/xmlwf.bpr up to 1.1.1.3 +external/mit/expat/dist/bcb5/xmlwf.mak up to 1.1.1.2 +external/mit/expat/dist/configure up to 1.1.1.4 +external/mit/expat/dist/configure.acup to 1.1.1.2 +external/mit/expat/dist/conftools/config.guess up to 1.3 +external/mit/expat/dist/conftools/config.subup to 1.3 +external/mit/expat/dist/conftools/install-shup to 1.1.1.4 +external/mit/expat/dist/conftools/ltmain.sh up to 1.1.1.4 +external/mit/expat/dist/doc/expat.png up to 1.1.1.2 +external/mit/expat/dist/doc/valid-xhtml10.png up to 1.1.1.2 +external/mit/expat/dist/doc/xmlwf.1 up to 1.1.1.3 +external/mit/expat/dist/doc/xmlwf.sgml delete +external/mit/expat/dist/doc/xmlwf.xml up to 1.1.1.1 +external/mit/expat/dist/examples/elements.c up to 1.1.1.3 +external/mit/expat/dist/examples/outline.c up to 1.1.1.2 +external/mit/expat/dist/expat_config.h.in up to 1.1.1.4 +external/mit/expat/dist/lib/expat.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expat.h up to 1.1.1.4 +external/mit/expat/dist/lib/expat_external.hup to 1.1.1.2 +external/mit/expat/dist/lib/expat_static.dspup to 1.1.1.3 +external/mit/expat/dist/lib/expatw.dsp up to 1.1.1.3 +external/mit/expat/dist/lib/expatw_static.dsp up to 1.1.1.2 +external/mit/expat/dist/lib/internal.h up to 1.1.1.2 +external/mit/expat/dist/lib/xmlparse.c up to 1.6 +external/mit/expat/dist/lib/xmlrole.c up to 1.1.1.3 +external/mit/expat/dist/lib/xmltok.cup to 1.3 +external/mit/expat/dist/lib/xmltok_impl.c up to 1.5 +external/mit/expat/dist/m4/libtool.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltoptions.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/ltsugar.m4 up to 1.1.1.2 +external/mit/expat/dist/m4/ltversion.m4 up to 1.1.1.3 +external/mit/expat/dist/m4/lt~obsolete.m4 up to 1.1.1.2 +external/mit/expat/dist/tests/chardata.cup to 1.1.1.3 +external/mit/expat/dist/tests/minicheck.c up to 1.1.1.2 +external/mit/expat/dist/tests/minicheck.h up to 1.1.1.3 +external/mit/expat/dist/tests/runtests.cup to 1.1.1.3 +external/mit/expat/dist/tests/xmltest.shup to 1.2 +external/mit/expat/dist/win32/README.txtup to 1.1.1.3 +external/mit/expat/dist/win32/expat.iss up to 1.1.1.4 +external/mit/expat/dist/xmlwf/codepage.cup to 1.1.1.2 +external/mit/expat/dist/xmlwf/readfilemap.c up to 1.1.1.3 +external/mit/expat/dist/xmlwf/xmlfile.c up to 1.1.1.2 +external/mit/expat/dist/xmlwf/xmlwf.c up to 1.1.1.4 +external/mit/expat/dist/xmlwf/xmlwf.dsp up to 1.1.1.3 +external/mit/expat/lib/libexpat/expat_config.h up to 1.4 + + Update expat to 2.2.0, fixing CVE-2016-0718, CVE-2016-4472, + CVE-2016-5300, and CVE-2012-6702. + [spz, ticket #1361] + +doc/3RDPARTY patch
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Sun Feb 19 05:01:21 UTC 2017 Modified Files: src/doc [netbsd-7]: 3RDPARTY src/external/bsd/tcpdump/bin [netbsd-7]: Makefile src/external/bsd/tcpdump/dist [netbsd-7]: CHANGES CREDITS INSTALL.txt Makefile.in README.md VERSION aclocal.m4 addrtoname.c addrtoname.h af.c af.h ah.h appletalk.h atm.h bpf_dump.c chdlc.h checksum.c config.guess config.h.in config.sub configure configure.in cpack.c cpack.h ether.h ethertype.h extract.h gmpls.c gmpls.h gmt2local.c gmt2local.h in_cksum.c install-sh interface.h ip.h ip6.h ipproto.c ipproto.h l2vpn.c l2vpn.h llc.h machdep.c machdep.h makemib mib.h mkdep mpls.h nameser.h netdissect.h nfs.h nfsfh.h nlpid.c nlpid.h openflow.h ospf.h oui.c oui.h parsenfsfh.c pcap-missing.h pcap_dump_ftell.c ppp.h print-802_11.c print-802_15_4.c print-ah.c print-aodv.c print-ap1394.c print-arcnet.c print-arp.c print-ascii.c print-atalk.c print-atm.c print-babel.c print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c print-calm-fast.c print-carp.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c print-dhcp6.c print-domain.c print-dtp.c print-dvmrp.c print-eap.c print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c print-frag6.c print-geonet.c print-gre.c print-hsrp.c print-icmp.c print-icmp6.c print-igmp.c print-igrp.c print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c print-ipnet.c print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c print-llc.c print-lldp.c print-lmp.c print-lspping.c print-lwapp.c print-lwres.c print-mobile.c print-mobility.c print-mpcp.c print-mpls.c print-mptcp.c print-msdp.c print-msnlb.c print-nflog.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-openflow-1.0.c print-openflow.c print-ospf.c print-ospf6.c print-otv.c print-pflog.c print-pfsync.c print-pgm.c print-pim.c print-ppi.c print-ppp.c print-pppoe.c print-pptp.c print-radius.c print-raw.c print-rip.c print-ripng.c print-rpki-rtr.c print-rrcp.c print-rsvp.c print-rt6.c print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c print-timed.c print-tipc.c print-token.c print-udld.c print-udp.c print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-vxlan.c print-wb.c print-zephyr.c print-zeromq.c rpc_auth.h rpc_msg.h setsignal.c setsignal.h signature.c signature.h slcompress.h smb.h smbutil.c tcp.h tcpdump.1.in tcpdump.c udp.h vfprintf.c src/external/bsd/tcpdump/dist/lbl [netbsd-7]: os-osf4.h os-solaris2.h os-sunos4.h os-ultrix4.h src/external/bsd/tcpdump/dist/missing [netbsd-7]: datalinks.c dlnames.c snprintf.c strdup.c strlcat.c strlcpy.c strsep.c src/external/bsd/tcpdump/dist/tests [netbsd-7]: TESTLIST TESTonce TESTrun.sh babel1.out babel1v.out babel_auth.out bgp_vpn_attrset.out evb.out forces1vvv.out forces1.out ieee802.11_exthdr.out ieee802.11_rx-stbc.out mpbgp-linklocal-nexthop.out of10_p3295-vv.out of10_s4810-.out print-A.out print-AA.out print-capX.out print-capXX.out print-flags.pcap print-x.out print-xx.out src/external/bsd/tcpdump/dist/win32/prj [netbsd-7]: GNUmakefile WinDump.dsp src/external/bsd/tcpdump/include [netbsd-7]: config.h Added Files: src/external/bsd/tcpdump/dist [netbsd-7]: CONTRIBUTING PLATFORMS README addrtostr.c addrtostr.h ascii_strcasecmp.c ascii_strcasecmp.h getopt_long.h netdissect-stdinc.h netdissect.c print-ahcp.c print-aoe.c print-ftp.c print-geneve.c print-hncp.c print-http.c print-lisp.c print-loopback.c print-m3ua.c print-medsa.c print-nsh.c print-pktap.c print-resp.c print-rtsp.c print-smtp.c print-vxlan-gpe.c print.c print.h rpl.h strtoaddr.c strtoaddr.h timeval-operations.h util-print.c src/external/bsd/tcpdump/dist/missing [netbsd-7]: getopt_long.c src/external/bsd/tcpdump/dist/tests [netbsd-7]: 3560_CDP.pcap 802.1D_spanning_tree.pcap 802.1w_rapid_STP.pcap AoE_Linux.pcap DECnet_Phone.pcap DTP.pcap EIGRP_adjacency.pcap EIGRP_goodbye.pcap EIGRP_subnet_down.pcap EIGRP_subnet_up.pcap HDLC.pcap
CVS commit: [netbsd-7-0] src
Module Name:src Committed By: snj Date: Sun Feb 19 04:59:48 UTC 2017 Modified Files: src/doc [netbsd-7-0]: 3RDPARTY src/external/bsd/tcpdump/bin [netbsd-7-0]: Makefile src/external/bsd/tcpdump/dist [netbsd-7-0]: CHANGES CREDITS INSTALL.txt Makefile.in README.md VERSION aclocal.m4 addrtoname.c addrtoname.h af.c af.h ah.h appletalk.h atm.h bpf_dump.c chdlc.h checksum.c config.guess config.h.in config.sub configure configure.in cpack.c cpack.h ether.h ethertype.h extract.h gmpls.c gmpls.h gmt2local.c gmt2local.h in_cksum.c install-sh interface.h ip.h ip6.h ipproto.c ipproto.h l2vpn.c l2vpn.h llc.h machdep.c machdep.h makemib mib.h mkdep mpls.h nameser.h netdissect.h nfs.h nfsfh.h nlpid.c nlpid.h openflow.h ospf.h oui.c oui.h parsenfsfh.c pcap-missing.h pcap_dump_ftell.c ppp.h print-802_11.c print-802_15_4.c print-ah.c print-aodv.c print-ap1394.c print-arcnet.c print-arp.c print-ascii.c print-atalk.c print-atm.c print-babel.c print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c print-calm-fast.c print-carp.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c print-dhcp6.c print-domain.c print-dtp.c print-dvmrp.c print-eap.c print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c print-frag6.c print-geonet.c print-gre.c print-hsrp.c print-icmp.c print-icmp6.c print-igmp.c print-igrp.c print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c print-ipnet.c print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c print-llc.c print-lldp.c print-lmp.c print-lspping.c print-lwapp.c print-lwres.c print-mobile.c print-mobility.c print-mpcp.c print-mpls.c print-mptcp.c print-msdp.c print-msnlb.c print-nflog.c print-nfs.c print-ntp.c print-null.c print-olsr.c print-openflow-1.0.c print-openflow.c print-ospf.c print-ospf6.c print-otv.c print-pflog.c print-pfsync.c print-pgm.c print-pim.c print-ppi.c print-ppp.c print-pppoe.c print-pptp.c print-radius.c print-raw.c print-rip.c print-ripng.c print-rpki-rtr.c print-rrcp.c print-rsvp.c print-rt6.c print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c print-timed.c print-tipc.c print-token.c print-udld.c print-udp.c print-usb.c print-vjc.c print-vqp.c print-vrrp.c print-vtp.c print-vxlan.c print-wb.c print-zephyr.c print-zeromq.c rpc_auth.h rpc_msg.h setsignal.c setsignal.h signature.c signature.h slcompress.h smb.h smbutil.c tcp.h tcpdump.1.in tcpdump.c udp.h vfprintf.c src/external/bsd/tcpdump/dist/lbl [netbsd-7-0]: os-osf4.h os-solaris2.h os-sunos4.h os-ultrix4.h src/external/bsd/tcpdump/dist/missing [netbsd-7-0]: datalinks.c dlnames.c snprintf.c strdup.c strlcat.c strlcpy.c strsep.c src/external/bsd/tcpdump/dist/tests [netbsd-7-0]: TESTLIST TESTonce TESTrun.sh babel1.out babel1v.out babel_auth.out bgp_vpn_attrset.out evb.out forces1vvv.out forces1.out ieee802.11_exthdr.out ieee802.11_rx-stbc.out mpbgp-linklocal-nexthop.out of10_p3295-vv.out of10_s4810-.out print-A.out print-AA.out print-capX.out print-capXX.out print-flags.pcap print-x.out print-xx.out src/external/bsd/tcpdump/dist/win32/prj [netbsd-7-0]: GNUmakefile WinDump.dsp src/external/bsd/tcpdump/include [netbsd-7-0]: config.h Added Files: src/external/bsd/tcpdump/dist [netbsd-7-0]: CONTRIBUTING PLATFORMS README addrtostr.c addrtostr.h ascii_strcasecmp.c ascii_strcasecmp.h getopt_long.h netdissect-stdinc.h netdissect.c print-ahcp.c print-aoe.c print-ftp.c print-geneve.c print-hncp.c print-http.c print-lisp.c print-loopback.c print-m3ua.c print-medsa.c print-nsh.c print-pktap.c print-resp.c print-rtsp.c print-smtp.c print-vxlan-gpe.c print.c print.h rpl.h strtoaddr.c strtoaddr.h timeval-operations.h util-print.c src/external/bsd/tcpdump/dist/missing [netbsd-7-0]: getopt_long.c src/external/bsd/tcpdump/dist/tests [netbsd-7-0]: 3560_CDP.pcap 802.1D_spanning_tree.pcap 802.1w_rapid_STP.pcap AoE_Linux.pcap DECnet_Phone.pcap DTP.pcap EIGRP_adjacency.pcap EIGRP_goodbye.pcap EIGRP_subnet_down.pcap
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Sun Feb 19 04:53:24 UTC 2017 Modified Files: src/doc [netbsd-7]: 3RDPARTY src/external/mit/expat/dist [netbsd-7]: CMake.README CMakeLists.txt COPYING Changes MANIFEST Makefile.in README aclocal.m4 configure configure.ac expat_config.h.in src/external/mit/expat/dist/bcb5 [netbsd-7]: expat.bpr expat.mak expat_static.bpr expat_static.mak expatw.bpr expatw.mak expatw_static.bpr expatw_static.mak xmlwf.bpr xmlwf.mak src/external/mit/expat/dist/conftools [netbsd-7]: config.guess config.sub install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-7]: expat.png valid-xhtml10.png xmlwf.1 src/external/mit/expat/dist/examples [netbsd-7]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-7]: expat.dsp expat.h expat_external.h expat_static.dsp expatw.dsp expatw_static.dsp internal.h xmlparse.c xmlrole.c xmltok.c xmltok_impl.c src/external/mit/expat/dist/m4 [netbsd-7]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/dist/tests [netbsd-7]: chardata.c minicheck.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/win32 [netbsd-7]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-7]: codepage.c readfilemap.c xmlfile.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-7]: expat_config.h Added Files: src/external/mit/expat/dist/doc [netbsd-7]: xmlwf.xml Removed Files: src/external/mit/expat/dist/doc [netbsd-7]: xmlwf.sgml Log Message: Pull up following revision(s) (requested by spz in ticket #1361): doc/3RDPARTY: 1.398, 1.1407 external/mit/expat/dist/CMake.README: up to 1.1.1.3 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3 external/mit/expat/dist/COPYING: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.4 external/mit/expat/dist/MANIFEST: up to 1.1.1.4 external/mit/expat/dist/Makefile.in: up to 1.1.1.4 external/mit/expat/dist/README: up to 1.1.1.4 external/mit/expat/dist/aclocal.m4: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.4 external/mit/expat/dist/configure.ac: up to 1.1.1.2 external/mit/expat/dist/conftools/config.guess: up to 1.3 external/mit/expat/dist/conftools/config.sub: up to 1.3 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4 external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4 external/mit/expat/dist/doc/expat.png: up to 1.1.1.2 external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.sgml delete external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1 external/mit/expat/dist/examples/elements.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.c: up to 1.1.1.2 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expat.h: up to 1.1.1.4 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/internal.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.6 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3 external/mit/expat/dist/lib/xmltok.c: up to 1.3 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3 external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.2 external/mit/expat/dist/tests/chardata.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.2
CVS commit: [netbsd-7-0] src
Module Name:src Committed By: snj Date: Sun Feb 19 04:52:29 UTC 2017 Modified Files: src/doc [netbsd-7-0]: 3RDPARTY src/external/mit/expat/dist [netbsd-7-0]: CMake.README CMakeLists.txt COPYING Changes MANIFEST Makefile.in README aclocal.m4 configure configure.ac expat_config.h.in src/external/mit/expat/dist/bcb5 [netbsd-7-0]: expat.bpr expat.mak expat_static.bpr expat_static.mak expatw.bpr expatw.mak expatw_static.bpr expatw_static.mak xmlwf.bpr xmlwf.mak src/external/mit/expat/dist/conftools [netbsd-7-0]: config.guess config.sub install-sh ltmain.sh src/external/mit/expat/dist/doc [netbsd-7-0]: expat.png valid-xhtml10.png xmlwf.1 src/external/mit/expat/dist/examples [netbsd-7-0]: elements.c outline.c src/external/mit/expat/dist/lib [netbsd-7-0]: expat.dsp expat.h expat_external.h expat_static.dsp expatw.dsp expatw_static.dsp internal.h xmlparse.c xmlrole.c xmltok.c xmltok_impl.c src/external/mit/expat/dist/m4 [netbsd-7-0]: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 src/external/mit/expat/dist/tests [netbsd-7-0]: chardata.c minicheck.c minicheck.h runtests.c xmltest.sh src/external/mit/expat/dist/win32 [netbsd-7-0]: README.txt expat.iss src/external/mit/expat/dist/xmlwf [netbsd-7-0]: codepage.c readfilemap.c xmlfile.c xmlwf.c xmlwf.dsp src/external/mit/expat/lib/libexpat [netbsd-7-0]: expat_config.h Added Files: src/external/mit/expat/dist/doc [netbsd-7-0]: xmlwf.xml Removed Files: src/external/mit/expat/dist/doc [netbsd-7-0]: xmlwf.sgml Log Message: Pull up following revision(s) (requested by spz in ticket #1361): doc/3RDPARTY: 1.398, 1.1407 external/mit/expat/dist/CMake.README: up to 1.1.1.3 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.3 external/mit/expat/dist/COPYING: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.4 external/mit/expat/dist/MANIFEST: up to 1.1.1.4 external/mit/expat/dist/Makefile.in: up to 1.1.1.4 external/mit/expat/dist/README: up to 1.1.1.4 external/mit/expat/dist/aclocal.m4: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expat_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/expatw_static.mak: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.3 external/mit/expat/dist/bcb5/xmlwf.mak: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.4 external/mit/expat/dist/configure.ac: up to 1.1.1.2 external/mit/expat/dist/conftools/config.guess: up to 1.3 external/mit/expat/dist/conftools/config.sub: up to 1.3 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.4 external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.4 external/mit/expat/dist/doc/expat.png: up to 1.1.1.2 external/mit/expat/dist/doc/valid-xhtml10.png: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.sgml delete external/mit/expat/dist/doc/xmlwf.xml: up to 1.1.1.1 external/mit/expat/dist/examples/elements.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.c: up to 1.1.1.2 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.4 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expat.h: up to 1.1.1.4 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.3 external/mit/expat/dist/lib/expatw_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/internal.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.6 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.3 external/mit/expat/dist/lib/xmltok.c: up to 1.3 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.5 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.3 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.3 external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.2 external/mit/expat/dist/tests/chardata.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.2
CVS commit: src/sys/net/npf
Module Name:src Committed By: christos Date: Sun Feb 19 02:11:19 UTC 2017 Modified Files: src/sys/net/npf: npf_impl.h Log Message: forgot to commit this (new prototype) To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/net/npf/npf_impl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/npf/npf_impl.h diff -u src/sys/net/npf/npf_impl.h:1.68 src/sys/net/npf/npf_impl.h:1.69 --- src/sys/net/npf/npf_impl.h:1.68 Sat Jan 28 19:15:54 2017 +++ src/sys/net/npf/npf_impl.h Sat Feb 18 21:11:19 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_impl.h,v 1.68 2017/01/29 00:15:54 christos Exp $ */ +/* $NetBSD: npf_impl.h,v 1.69 2017/02/19 02:11:19 christos Exp $ */ /*- * Copyright (c) 2009-2014 The NetBSD Foundation, Inc. @@ -246,6 +246,7 @@ u_int npf_ifmap_register(npf_t *, const void npf_ifmap_flush(npf_t *); u_int npf_ifmap_getid(npf_t *, const ifnet_t *); const char * npf_ifmap_getname(npf_t *, const u_int); +void npf_ifmap_copyname(npf_t *, u_int, char *, size_t); void npf_ifaddr_sync(npf_t *, ifnet_t *); void npf_ifaddr_flush(npf_t *, ifnet_t *);
CVS commit: src/sys/net/npf
Module Name:src
Committed By: christos
Date: Sat Feb 18 23:27:32 UTC 2017
Modified Files:
src/sys/net/npf: npf_ext_log.c npf_if.c
Log Message:
provide a copy function used for logging that does not lock, but can return
trash.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/net/npf/npf_ext_log.c
cvs rdiff -u -r1.7 -r1.8 src/sys/net/npf/npf_if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_ext_log.c
diff -u src/sys/net/npf/npf_ext_log.c:1.12 src/sys/net/npf/npf_ext_log.c:1.13
--- src/sys/net/npf/npf_ext_log.c:1.12 Sat Feb 18 13:08:16 2017
+++ src/sys/net/npf/npf_ext_log.c Sat Feb 18 18:27:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ext_log.c,v 1.12 2017/02/18 18:08:16 mlelstv Exp $ */
+/* $NetBSD: npf_ext_log.c,v 1.13 2017/02/18 23:27:32 christos Exp $ */
/*-
* Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.12 2017/02/18 18:08:16 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.13 2017/02/18 23:27:32 christos Exp $");
#include
#include
@@ -104,15 +104,10 @@ npf_log(npf_cache_t *npc, void *meta, co
hdr.action = *decision == NPF_DECISION_PASS ?
0 /* pass */ : 1 /* block */;
hdr.reason = 0; /* match */
-#if 0
- struct nbuf *nb = npc->npc_nbuf;
- const char *ifname = nb && nb->nb_ifid ?
- npf_ifmap_getname(npc->npc_ctx, nb->nb_ifid) : "???";
-#else
- const char *ifname = "???";
-#endif
- strlcpy(hdr.ifname, ifname, sizeof(hdr.ifname));
+ struct nbuf *nb = npc->npc_nbuf;
+ npf_ifmap_copyname(npc->npc_ctx, nb ? nb->nb_ifid : 0,
+ hdr.ifname, sizeof(hdr.ifname));
hdr.rulenr = htonl((uint32_t)mi->mi_rid);
hdr.subrulenr = htonl((uint32_t)(mi->mi_rid >> 32));
Index: src/sys/net/npf/npf_if.c
diff -u src/sys/net/npf/npf_if.c:1.7 src/sys/net/npf/npf_if.c:1.8
--- src/sys/net/npf/npf_if.c:1.7 Mon Dec 26 18:05:06 2016
+++ src/sys/net/npf/npf_if.c Sat Feb 18 18:27:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_if.c,v 1.7 2016/12/26 23:05:06 christos Exp $ */
+/* $NetBSD: npf_if.c,v 1.8 2017/02/18 23:27:32 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_if.c,v 1.7 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_if.c,v 1.8 2017/02/18 23:27:32 christos Exp $");
#include
#include
@@ -155,6 +155,20 @@ npf_ifmap_getid(npf_t *npf, const ifnet_
return i;
}
+/*
+ * This function is toxic; it can return garbage since we don't
+ * lock, but it is only used temporarily and only for logging.
+ */
+void
+npf_ifmap_copyname(npf_t *npf, u_int id, char *buf, size_t len)
+{
+ if (id > 0 && id < npf->ifmap_cnt)
+ strlcpy(buf, npf->ifmap[id - 1].n_ifname,
+ MIN(len, sizeof(npf->ifmap[id - 1].n_ifname)));
+ else
+ strlcpy(buf, "???", len);
+}
+
const char *
npf_ifmap_getname(npf_t *npf, const u_int id)
{
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Feb 18 22:39:02 UTC 2017 Modified Files: src/share/man/man4: speaker.4 vmmon.4 vmnet.4 src/share/man/man4/man4.acorn32: asc.4 cosc.4 csc.4 ie.4 iomdkbc.4 src/share/man/man4/man4.alpha: asc.4 gbus.4 jensenio.4 mcbus.4 sableio.4 tsc.4 tsciic.4 tsp.4 ttwoga.4 ttwopci.4 src/share/man/man4/man4.amiga: bah.4 bppcsc.4 ed.4 es.4 grf.4 p5pb.4 qn.4 xsh.4 xsurf.4 src/share/man/man4/man4.emips: enic.4 src/share/man/man4/man4.evbarm: bcmgpio.4 src/share/man/man4/man4.evbmips: intro.4 src/share/man/man4/man4.evbppc: intro_pmppc.4 mainbus.4 src/share/man/man4/man4.hp300: dio.4 src/share/man/man4/man4.hppa: dino.4 io.4 lasi.4 src/share/man/man4/man4.i386: elansc.4 src/share/man/man4/man4.mac68k: cpi.4 obio.4 src/share/man/man4/man4.macppc: gm.4 intro.4 obio.4 src/share/man/man4/man4.mvme68k: ie.4 src/share/man/man4/man4.pmax: asc.4 pm.4 src/share/man/man4/man4.prep: intro.4 src/share/man/man4/man4.sgimips: giopci.4 intro.4 mace.4 mec.4 sq.4 wdsc.4 src/share/man/man4/man4.sparc: intro.4 pnozz.4 src/share/man/man4/man4.sun2: ec.4 ie.4 intro.4 src/share/man/man4/man4.sun3: ie.4 intro.4 src/share/man/man4/man4.vax: asc.4 dmv.4 ht.4 intro.4 mt.4 np.4 tm.4 ts.4 src/share/man/man4/man4.x68k: mfp.4 neptune.4 src/share/man/man4/man4.x86: amdpcib.4 apic.4 fwhrng.4 ichlpcib.4 Log Message: Fix xrefs, sort. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/speaker.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/vmmon.4 \ src/share/man/man4/vmnet.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.acorn32/asc.4 \ src/share/man/man4/man4.acorn32/cosc.4 \ src/share/man/man4/man4.acorn32/csc.4 \ src/share/man/man4/man4.acorn32/ie.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.acorn32/iomdkbc.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.alpha/asc.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.alpha/gbus.4 \ src/share/man/man4/man4.alpha/jensenio.4 \ src/share/man/man4/man4.alpha/mcbus.4 src/share/man/man4/man4.alpha/tsp.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.alpha/sableio.4 \ src/share/man/man4/man4.alpha/tsc.4 \ src/share/man/man4/man4.alpha/ttwoga.4 \ src/share/man/man4/man4.alpha/ttwopci.4 cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.alpha/tsciic.4 cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/man4.amiga/bah.4 cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/man4.amiga/bppcsc.4 \ src/share/man/man4/man4.amiga/xsurf.4 cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/man4.amiga/ed.4 cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/man4.amiga/es.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.amiga/grf.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/man4.amiga/p5pb.4 cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/man4.amiga/qn.4 \ src/share/man/man4/man4.amiga/xsh.4 cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.emips/enic.4 cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.evbarm/bcmgpio.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.evbmips/intro.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.evbppc/intro_pmppc.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.evbppc/mainbus.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.hp300/dio.4 cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.hppa/dino.4 \ src/share/man/man4/man4.hppa/io.4 src/share/man/man4/man4.hppa/lasi.4 cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/man4.i386/elansc.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.mac68k/cpi.4 cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/man4.mac68k/obio.4 cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/man4.macppc/gm.4 cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.macppc/intro.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.macppc/obio.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.mvme68k/ie.4 cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/man4.pmax/asc.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.pmax/pm.4 cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.prep/intro.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.sgimips/giopci.4 cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/man4.sgimips/intro.4 cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.sgimips/mace.4 \ src/share/man/man4/man4.sgimips/sq.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.sgimips/mec.4 cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.sgimips/wdsc.4 cvs rdiff -u -r1.25 -r1.26 src/share/man/man4/man4.sparc/intro.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.sparc/pnozz.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.sun2/ec.4 \ src/share/man/man4/man4.sun2/ie.4 cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.sun2/intro.4 cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.sun3/ie.4 cvs rdiff -u -r1.11 -r1.12
CVS commit: src/share/man/man8/man8.x86
Module Name:src Committed By: christos Date: Sat Feb 18 21:51:36 UTC 2017 Modified Files: src/share/man/man8/man8.x86: boot.8 Log Message: remove extra / To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man8/man8.x86/boot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/man8.x86/boot.8 diff -u src/share/man/man8/man8.x86/boot.8:1.10 src/share/man/man8/man8.x86/boot.8:1.11 --- src/share/man/man8/man8.x86/boot.8:1.10 Sat Feb 18 16:39:53 2017 +++ src/share/man/man8/man8.x86/boot.8 Sat Feb 18 16:51:36 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.10 2017/02/18 21:39:53 wiz Exp $ +.\" $NetBSD: boot.8,v 1.11 2017/02/18 21:51:36 christos Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -717,7 +717,7 @@ partition by .Xr x86/mbr 8 , .Xr x86/multiboot 8 , .Xr x86/pxeboot 8 , -.Xr /boothowto 9 +.Xr boothowto 9 .Sh BUGS The kernel file name must be specified before, not after, the boot options. Any
CVS commit: src/share/man/man8
Module Name:src Committed By: wiz Date: Sat Feb 18 21:47:11 UTC 2017 Modified Files: src/share/man/man8: boot.8 src/share/man/man8/man8.alpha: boot.8 setnetbootinfo.8 src/share/man/man8/man8.amiga: boot.8 src/share/man/man8/man8.atari: ahdilabel.8 src/share/man/man8/man8.prep: mkbootimage.8 src/share/man/man8/man8.x68k: newdisk.8 Log Message: Fix xrefs, sort. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/share/man/man8/boot.8 cvs rdiff -u -r1.14 -r1.15 src/share/man/man8/man8.alpha/boot.8 cvs rdiff -u -r1.12 -r1.13 src/share/man/man8/man8.alpha/setnetbootinfo.8 cvs rdiff -u -r1.15 -r1.16 src/share/man/man8/man8.amiga/boot.8 cvs rdiff -u -r1.12 -r1.13 src/share/man/man8/man8.atari/ahdilabel.8 cvs rdiff -u -r1.7 -r1.8 src/share/man/man8/man8.prep/mkbootimage.8 cvs rdiff -u -r1.11 -r1.12 src/share/man/man8/man8.x68k/newdisk.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/boot.8 diff -u src/share/man/man8/boot.8:1.15 src/share/man/man8/boot.8:1.16 --- src/share/man/man8/boot.8:1.15 Sat Aug 16 11:39:47 2014 +++ src/share/man/man8/boot.8 Sat Feb 18 21:47:11 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.15 2014/08/16 11:39:47 apb Exp $ +.\" $NetBSD: boot.8,v 1.16 2017/02/18 21:47:11 wiz Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -219,7 +219,7 @@ or See .Sx Console Selection Policy in -.Xr boot_console 8 . +.Xr x86/boot_console 8 . .It Ic dev Op Va device Set the default drive and partition for subsequent filesystem operations. Index: src/share/man/man8/man8.alpha/boot.8 diff -u src/share/man/man8/man8.alpha/boot.8:1.14 src/share/man/man8/man8.alpha/boot.8:1.15 --- src/share/man/man8/man8.alpha/boot.8:1.14 Fri Feb 17 22:30:27 2017 +++ src/share/man/man8/man8.alpha/boot.8 Sat Feb 18 21:47:11 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.14 2017/02/17 22:30:27 christos Exp $ +.\" $NetBSD: boot.8,v 1.15 2017/02/18 21:47:11 wiz Exp $ .\" .\" Copyright (c) 1999 Christopher G. Demetriou .\" All rights reserved. @@ -512,14 +512,14 @@ disk and tape bootstrap .El .Sh SEE ALSO .Xr ddb 4 , +.Xr alpha/mkbootimage 8 , +.Xr alpha/setnetbootinfo 8 , .Xr diskless 8 , .Xr init 8 , .Xr installboot 8 , -.Xr alpha/mkbootimage 8 , .Xr rc 8 , .Xr reboot 8 , .Xr savecore 8 , -.Xr alpha/setnetbootinfo 8 , .Xr shutdown 8 .Rs .%T "Alpha Architecture Reference Manual Third Edition" Index: src/share/man/man8/man8.alpha/setnetbootinfo.8 diff -u src/share/man/man8/man8.alpha/setnetbootinfo.8:1.12 src/share/man/man8/man8.alpha/setnetbootinfo.8:1.13 --- src/share/man/man8/man8.alpha/setnetbootinfo.8:1.12 Fri Feb 17 22:30:27 2017 +++ src/share/man/man8/man8.alpha/setnetbootinfo.8 Sat Feb 18 21:47:11 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: setnetbootinfo.8,v 1.12 2017/02/17 22:30:27 christos Exp $ +.\" $NetBSD: setnetbootinfo.8,v 1.13 2017/02/18 21:47:11 wiz Exp $ .\" .\" Copyright (c) 1997, 1999 Christopher G. Demetriou .\" All rights reserved. @@ -138,7 +138,7 @@ network bootstrap program .\" XXX .Sh SEE ALSO .Xr alpha/boot 8 , -.Xr alpha/bootpd 8 +.Xr bootpd 8 .Sh HISTORY The .Nx Ns Tn /alpha Index: src/share/man/man8/man8.amiga/boot.8 diff -u src/share/man/man8/man8.amiga/boot.8:1.15 src/share/man/man8/man8.amiga/boot.8:1.16 --- src/share/man/man8/man8.amiga/boot.8:1.15 Fri Feb 17 22:30:27 2017 +++ src/share/man/man8/man8.amiga/boot.8 Sat Feb 18 21:47:11 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.15 2017/02/17 22:30:27 christos Exp $ +.\" $NetBSD: boot.8,v 1.16 2017/02/18 21:47:11 wiz Exp $ .\" .\" Copyright (c) 1990, 1991 The Regents of the University of California. .\" All rights reserved. @@ -247,8 +247,8 @@ secondary bootstrap (installed) .El .Sh SEE ALSO .Xr ddb 4 , -.Xr fsck_ffs 8 , .Xr amiga/installboot 8 , +.Xr fsck_ffs 8 , .Xr newfs 8 , .Xr savecore 8 , .Xr shutdown 8 Index: src/share/man/man8/man8.atari/ahdilabel.8 diff -u src/share/man/man8/man8.atari/ahdilabel.8:1.12 src/share/man/man8/man8.atari/ahdilabel.8:1.13 --- src/share/man/man8/man8.atari/ahdilabel.8:1.12 Fri Feb 17 22:30:28 2017 +++ src/share/man/man8/man8.atari/ahdilabel.8 Sat Feb 18 21:47:11 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: ahdilabel.8,v 1.12 2017/02/17 22:30:28 christos Exp $ +.\" $NetBSD: ahdilabel.8,v 1.13 2017/02/18 21:47:11 wiz Exp $ .\" .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -142,8 +142,8 @@ Quit Edit the AHDI label for disk sd0. .Sh SEE ALSO .Xr atari/bootpref 8 , -.Xr disklabel 8 , -.Xr atari/installboot 8 +.Xr atari/installboot 8 , +.Xr disklabel 8 .Sh HISTORY The .Nm Index: src/share/man/man8/man8.prep/mkbootimage.8 diff -u src/share/man/man8/man8.prep/mkbootimage.8:1.7 src/share/man/man8/man8.prep/mkbootimage.8:1.8 --- src/share/man/man8/man8.prep/mkbootimage.8:1.7 Fri Feb 17 22:30:28 2017 +++
CVS commit: src/share/man/man8/man8.x86
Module Name:src Committed By: wiz Date: Sat Feb 18 21:39:53 UTC 2017 Modified Files: src/share/man/man8/man8.x86: boot.8 boot_console.8 mbr.8 pxeboot.8 Log Message: Fix xrefs, sort. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man8/man8.x86/boot.8 cvs rdiff -u -r1.3 -r1.4 src/share/man/man8/man8.x86/boot_console.8 \ src/share/man/man8/man8.x86/pxeboot.8 cvs rdiff -u -r1.2 -r1.3 src/share/man/man8/man8.x86/mbr.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/man8.x86/boot.8 diff -u src/share/man/man8/man8.x86/boot.8:1.9 src/share/man/man8/man8.x86/boot.8:1.10 --- src/share/man/man8/man8.x86/boot.8:1.9 Fri Feb 17 22:30:28 2017 +++ src/share/man/man8/man8.x86/boot.8 Sat Feb 18 21:39:53 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.9 2017/02/17 22:30:28 christos Exp $ +.\" $NetBSD: boot.8,v 1.10 2017/02/18 21:39:53 wiz Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -138,7 +138,7 @@ will be used to configure the behaviour setting the timeout, choosing a console device, altering the banner text and displaying a menu allowing boot commands to be easily chosen. See -.Xr x86/boot.cfg 5 . +.Xr boot.cfg 5 . .Ss Boot Protocol The .Nx Ns /x86 @@ -153,7 +153,7 @@ boot protocol, options are passed from t to the kernel via flag bits in the .Va boothowto variable (see -.Xr x86/boothowto 9 ) . +.Xr boothowto 9 ) . In the multiboot protocol, options are passed from the boot loader to the kernel as strings. .Ss Diagnostic Output @@ -384,7 +384,7 @@ DOM0 kernel before booting the .Tn Xen hypervisor. See -.Xr x86/boot.cfg 5 +.Xr boot.cfg 5 for examples. .Pp In addition to the @@ -521,7 +521,7 @@ must be passed as options to the .Ic multiboot command. See -.Xr x86/boot.cfg 5 +.Xr boot.cfg 5 for examples on how to boot .Nx Ns / Ns Xen. .It Nx No multiboot kernels @@ -630,7 +630,7 @@ file system to mount as root. There are three methods: .Bl -tag -width 04n -offset 04n .It Ic BTINFO_ROOTDEVICE Va from -.Xr x86/boot.cfg 5 +.Xr boot.cfg 5 or multiboot. The bootloader passes the root device name as driver, unit, and partition (like sd0a). @@ -706,7 +706,7 @@ partition by .Xr fd 4 , .Xr pciback 4 , .Xr userconf 4 , -.Xr x86/boot.cfg 5 , +.Xr boot.cfg 5 , .Xr halt 8 , .Xr installboot 8 , .Xr reboot 8 , @@ -717,7 +717,7 @@ partition by .Xr x86/mbr 8 , .Xr x86/multiboot 8 , .Xr x86/pxeboot 8 , -.Xr x86/boothowto 9 +.Xr /boothowto 9 .Sh BUGS The kernel file name must be specified before, not after, the boot options. Any Index: src/share/man/man8/man8.x86/boot_console.8 diff -u src/share/man/man8/man8.x86/boot_console.8:1.3 src/share/man/man8/man8.x86/boot_console.8:1.4 --- src/share/man/man8/man8.x86/boot_console.8:1.3 Fri Feb 17 22:30:28 2017 +++ src/share/man/man8/man8.x86/boot_console.8 Sat Feb 18 21:39:53 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot_console.8,v 1.3 2017/02/17 22:30:28 christos Exp $ +.\" $NetBSD: boot_console.8,v 1.4 2017/02/18 21:39:53 wiz Exp $ .\" .\" Copyright (c) 1997 .\" Matthias Drochner. All rights reserved. @@ -130,8 +130,8 @@ compile time options for the boot progra .\" .Sh SEE ALSO .Xr console 4 , -.Xr x86/boot 8 , -.Xr installboot 8 +.Xr installboot 8 , +.Xr x86/boot 8 .\" .Sh BUGS The serial communication parameters (byte-size, parity, stop-bits) are Index: src/share/man/man8/man8.x86/pxeboot.8 diff -u src/share/man/man8/man8.x86/pxeboot.8:1.3 src/share/man/man8/man8.x86/pxeboot.8:1.4 --- src/share/man/man8/man8.x86/pxeboot.8:1.3 Fri Feb 17 22:30:28 2017 +++ src/share/man/man8/man8.x86/pxeboot.8 Sat Feb 18 21:39:53 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: pxeboot.8,v 1.3 2017/02/17 22:30:28 christos Exp $ +.\" $NetBSD: pxeboot.8,v 1.4 2017/02/18 21:39:53 wiz Exp $ .\" .\" Copyright (c) 2003 .\" Matthias Drochner. All rights reserved. @@ -48,13 +48,13 @@ specification. By default, the .Nm program is configured with modules loading and -.Xr x86/boot.cfg 5 +.Xr boot.cfg 5 support disabled. See .Sx EXAMPLES for how to enable these options individually. This manual page assumes that -.Xr x86/boot.cfg 5 +.Xr boot.cfg 5 support is enabled. .Pp Network booting a system through @@ -81,14 +81,14 @@ program takes control. It immediately issues another .Tn DHCP request to get the name of a -.Xr x86/boot.cfg 5 +.Xr boot.cfg 5 file to load, using .Dq boot.cfg by default. If the boot config file is not found, or if the supplied file appears not to be a boot configuration file, the file is skipped. Otherwise it is loaded and obeyed as described in -.Xr x86/boot.cfg 5 . +.Xr boot.cfg 5 . If a boot configuration is not loaded, the user has the option to enter a limited version of the standard interactive boot mode by pressing a key within five seconds. @@ -255,7 +255,7 @@ file. .El .Sh EXAMPLES To enable -.Xr
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Feb 18 19:28:44 UTC 2017 Modified Files: src/sys/arch/amd64/conf: MODULAR Log Message: l2tp is a module To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/MODULAR diff -u src/sys/arch/amd64/conf/MODULAR:1.6 src/sys/arch/amd64/conf/MODULAR:1.7 --- src/sys/arch/amd64/conf/MODULAR:1.6 Sat Dec 17 23:35:26 2016 +++ src/sys/arch/amd64/conf/MODULAR Sat Feb 18 14:28:44 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.6 2016/12/18 04:35:26 dholland Exp $ +# $NetBSD: MODULAR,v 1.7 2017/02/18 19:28:44 christos Exp $ # # Try to exclude all the drivers in GENERIC that have been modularized # XXX: incomplete @@ -116,6 +116,7 @@ options MODULAR_DEFAULT_AUTOLOAD -no pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation -no pseudo-device vlan # IEEE 802.1q encapsulation -no pseudo-device agr # IEEE 802.3ad link aggregation +-no pseudo-device l2tp # L2TPv3 interface -no pseudo-device npf # NPF packet filter #
CVS commit: src/sys/net/npf
Module Name:src Committed By: mlelstv Date: Sat Feb 18 18:08:16 UTC 2017 Modified Files: src/sys/net/npf: npf_ext_log.c Log Message: npf_ifmap_getname requires the config to be locked. For now, just prevent the crash. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/net/npf/npf_ext_log.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/npf/npf_ext_log.c diff -u src/sys/net/npf/npf_ext_log.c:1.11 src/sys/net/npf/npf_ext_log.c:1.12 --- src/sys/net/npf/npf_ext_log.c:1.11 Sun Jan 29 00:15:54 2017 +++ src/sys/net/npf/npf_ext_log.c Sat Feb 18 18:08:16 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_ext_log.c,v 1.11 2017/01/29 00:15:54 christos Exp $ */ +/* $NetBSD: npf_ext_log.c,v 1.12 2017/02/18 18:08:16 mlelstv Exp $ */ /*- * Copyright (c) 2010-2012 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef _KERNEL #include -__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.11 2017/01/29 00:15:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.12 2017/02/18 18:08:16 mlelstv Exp $"); #include #include @@ -104,9 +104,13 @@ npf_log(npf_cache_t *npc, void *meta, co hdr.action = *decision == NPF_DECISION_PASS ? 0 /* pass */ : 1 /* block */; hdr.reason = 0; /* match */ +#if 0 struct nbuf *nb = npc->npc_nbuf; const char *ifname = nb && nb->nb_ifid ? npf_ifmap_getname(npc->npc_ctx, nb->nb_ifid) : "???"; +#else + const char *ifname = "???"; +#endif strlcpy(hdr.ifname, ifname, sizeof(hdr.ifname));
CVS commit: src/usr.bin/pmc
Module Name:src
Committed By: maxv
Date: Sat Feb 18 16:48:39 UTC 2017
Modified Files:
src/usr.bin/pmc: pmc.c
Log Message:
KNF, and make it less i386-specific.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/pmc/pmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pmc/pmc.c
diff -u src/usr.bin/pmc/pmc.c:1.17 src/usr.bin/pmc/pmc.c:1.18
--- src/usr.bin/pmc/pmc.c:1.17 Sun Jan 18 07:05:53 2009
+++ src/usr.bin/pmc/pmc.c Sat Feb 18 16:48:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmc.c,v 1.17 2009/01/18 07:05:53 lukem Exp $ */
+/* $NetBSD: pmc.c,v 1.18 2017/02/18 16:48:38 maxv Exp $ */
/*
* Copyright 2000 Wasabi Systems, Inc.
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: pmc.c,v 1.17 2009/01/18 07:05:53 lukem Exp $");
+__RCSID("$NetBSD: pmc.c,v 1.18 2017/02/18 16:48:38 maxv Exp $");
#endif
#include
@@ -52,6 +52,16 @@ __RCSID("$NetBSD: pmc.c,v 1.17 2009/01/1
#include
#include
+#if defined(__i386__)
+typedef struct i386_pmc_info_args x86_pmc_info_args_t;
+typedef struct i386_pmc_startstop_args x86_pmc_startstop_args_t;
+typedef struct i386_pmc_read_args x86_pmc_read_args_t;
+#else /* amd64 */
+typedef struct x86_64_pmc_info_args x86_pmc_info_args_t;
+typedef struct x86_64_pmc_startstop_args x86_pmc_startstop_args_t;
+typedef struct x86_64_pmc_read_args x86_pmc_read_args_t;
+#endif
+
struct pmc_name2val {
const char *name;
int val;
@@ -61,7 +71,7 @@ struct pmc_name2val {
static const struct pmc_name2val i586_names[] = {
{ "tlb-data-miss", PMC5_DATA_TLB_MISS, 0 },
{ "tlb-ins-miss", PMC5_INST_TLB_MISS, 0 },
- { "l1cache-ins-miss", PMC5_INST_CACHE_MISS, 0 },
+ { "l1cache-ins-miss", PMC5_INST_CACHE_MISS, 0 },
{ "l1cache-data-miss", PMC5_DATA_RW_MISS, 0 },
{ "l1cache-data-miss-read", PMC5_DATA_READ_MISS, 0 },
{ "l1cache-data-miss-write", PMC5_DATA_WRITE_MISS, 0 },
@@ -91,7 +101,7 @@ static const struct pmc_name2val i586_na
{ "bus-utilization", PMC5_BUS_UTILIZATION, 0 },
{ "bus-locked", PMC5_LOCKED_BUS, 0 },
{ "bus-io-cycle", PMC5_IO_CYCLE, 0 },
- { "fpu-flops", PMC5_FLOPS, 0 },
+ { "fpu-flops", PMC5_FLOPS, 0 },
{ "int-hw", PMC5_HARDWARE_INTR, 0 },
{ "break-match0", PMC5_BP0_MATCH, 0 },
{ "break-match1", PMC5_BP1_MATCH, 0 },
@@ -104,7 +114,7 @@ static const struct pmc_name2val i686_na
{ "l1cache-lines", PMC6_DCU_LINES_IN, 0 },
{ "l1cache-mlines", PMC6_DCU_M_LINES_IN, 0 },
{ "l1cache-mlines-evict", PMC6_DCU_M_LINES_OUT, 0 },
- { "l1cache-miss-wait", PMC6_DCU_MISS_OUTSTANDING, 0 },
+ { "l1cache-miss-wait", PMC6_DCU_MISS_OUTSTANDING, 0 },
{ "ins-fetch", PMC6_IFU_IFETCH, 0 },
{ "ins-fetch-misses", PMC6_IFU_IFETCH_MISS, 0 },
{ "itlb-misses", PMC6_IFU_IFETCH_MISS, 0 },
@@ -237,25 +247,25 @@ static const struct pmc_name2val k7_name
{ "seg-load-hs", K7_SEGMENT_REG_LOADS, 0x40 },
{ "seg-load-stall", K7_SEGMENT_LOAD_STALL, 0 },
{ "l1cache-access", K7_DATA_CACHE_ACCESS, 0 },
- { "l1cache-miss", K7_DATA_CACHE_MISS, 0 },
- { "l1cache-refill", K7_DATA_CACHE_REFILL, 0x1f },
- { "l1cache-refill-invalid", K7_DATA_CACHE_REFILL, 0x01 },
- { "l1cache-refill-shared", K7_DATA_CACHE_REFILL, 0x02 },
- { "l1cache-refill-exclusive", K7_DATA_CACHE_REFILL, 0x04 },
- { "l1cache-refill-owner", K7_DATA_CACHE_REFILL, 0x08 },
- { "l1cache-refill-modified", K7_DATA_CACHE_REFILL, 0x10 },
- { "l1cache-load", K7_DATA_CACHE_REFILL_SYSTEM, 0x1f },
- { "l1cache-load-invalid", K7_DATA_CACHE_REFILL_SYSTEM, 0x01 },
- { "l1cache-load-shared", K7_DATA_CACHE_REFILL_SYSTEM, 0x02 },
- { "l1cache-load-exclusive", K7_DATA_CACHE_REFILL_SYSTEM, 0x04 },
- { "l1cache-load-owner", K7_DATA_CACHE_REFILL_SYSTEM, 0x08 },
- { "l1cache-load-modified", K7_DATA_CACHE_REFILL_SYSTEM, 0x10 },
- { "l1cache-writeback", K7_DATA_CACHE_WBACK, 0x1f },
- { "l1cache-writeback-invalid", K7_DATA_CACHE_WBACK, 0x01 },
- { "l1cache-writeback-shared", K7_DATA_CACHE_WBACK, 0x02 },
- { "l1cache-writeback-exclusive",K7_DATA_CACHE_WBACK, 0x04 },
- { "l1cache-writeback-owner", K7_DATA_CACHE_WBACK, 0x08 },
- { "l1cache-writeback-modified", K7_DATA_CACHE_WBACK, 0x10 },
+ { "l1cache-miss", K7_DATA_CACHE_MISS, 0 },
+ { "l1cache-refill", K7_DATA_CACHE_REFILL, 0x1f },
+ { "l1cache-refill-invalid", K7_DATA_CACHE_REFILL, 0x01 },
+ { "l1cache-refill-shared", K7_DATA_CACHE_REFILL, 0x02 },
+ { "l1cache-refill-exclusive", K7_DATA_CACHE_REFILL, 0x04 },
+ { "l1cache-refill-owner", K7_DATA_CACHE_REFILL, 0x08 },
+ { "l1cache-refill-modified", K7_DATA_CACHE_REFILL, 0x10 },
+ { "l1cache-load", K7_DATA_CACHE_REFILL_SYSTEM, 0x1f },
+ { "l1cache-load-invalid", K7_DATA_CACHE_REFILL_SYSTEM, 0x01 },
+ { "l1cache-load-shared", K7_DATA_CACHE_REFILL_SYSTEM, 0x02 },
+ { "l1cache-load-exclusive", K7_DATA_CACHE_REFILL_SYSTEM, 0x04 },
+ { "l1cache-load-owner", K7_DATA_CACHE_REFILL_SYSTEM, 0x08 },
+ {
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: maxv Date: Sat Feb 18 16:15:51 UTC 2017 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add the AMD 10h family PMC values. Some values depend on the CPU revision, they are commented out. Several other values are common with K7, we could merge them later. This family of CPUs has a 12bit event selector, contrary to K7 (8bit). The thing is, i386's PMC interface takes as argument a uint8_t from userland, so these counters are not accessible (yet). To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.93 src/sys/arch/x86/include/specialreg.h:1.94 --- src/sys/arch/x86/include/specialreg.h:1.93 Sat Feb 11 15:11:45 2017 +++ src/sys/arch/x86/include/specialreg.h Sat Feb 18 16:15:51 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.93 2017/02/11 15:11:45 maxv Exp $ */ +/* $NetBSD: specialreg.h,v 1.94 2017/02/18 16:15:51 maxv Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -997,7 +997,7 @@ #define PMC6_RET_SEG_RENAMES 0xd6 /* P-II and P-III only */ /* - * AMD K7 Event Selector MSR format. + * AMD K7 Event Selector MSR format. [Doc: 22007K.pdf, Feb 2002] */ #define K7_EVTSEL_EVENT 0x00ff @@ -1084,3 +1084,164 @@ #define K7_BP1_MATCH 0xdd #define K7_BP2_MATCH 0xde #define K7_BP3_MATCH 0xdf + +/* + * AMD 10h family PMCs. [Doc: 31116.pdf, Jan 2013] + */ +/* Register MSRs */ +#define MSR_F10H_EVNTSEL0 0xc001 +#define MSR_F10H_EVNTSEL1 0xc0010001 +#define MSR_F10H_EVNTSEL2 0xc0010002 +#define MSR_F10H_EVNTSEL3 0xc0010003 +#define MSR_F10H_PERFCTR0 0xc0010004 +#define MSR_F10H_PERFCTR1 0xc0010005 +#define MSR_F10H_PERFCTR2 0xc0010006 +#define MSR_F10H_PERFCTR3 0xc0010007 +/* Event Selector MSR format */ +#define F10H_EVTSEL_EVENT_MASK 0x000F00FF +#define F10H_EVTSEL_EVENT_SHIFT_LOW 0 +#define F10H_EVTSEL_EVENT_SHIFT_HIGH 32 +#define F10H_EVTSEL_UNIT_MASK 0xFF00 +#define F10H_EVTSEL_UNIT_SHIFT 8 +#define F10H_EVTSEL_USR__BIT(16) +#define F10H_EVTSEL_OS__BIT(17) +#define F10H_EVTSEL_EDGE __BIT(18) +#define F10H_EVTSEL_RSVD1 __BIT(19) +#define F10H_EVTSEL_INT__BIT(20) +#define F10H_EVTSEL_RSVD2 __BIT(21) +#define F10H_EVTSEL_EN__BIT(22) +#define F10H_EVTSEL_INV__BIT(23) +#define F10H_EVTSEL_COUNTER_MASK 0xFF00 +#define F10H_EVTSEL_COUNTER_MASK_SHIFT 24 +/* Floating Point Events */ +#define F10H_FP_DISPATCHED_FPU_OPS 0x00 +#define F10H_FP_CYCLES_EMPTY_FPU_OPS 0x01 +#define F10H_FP_DISPATCHED_FASTFLAG_OPS 0x02 +#define F10H_FP_RETIRED_SSE_OPS 0x03 +#define F10H_FP_RETIRED_MOVE_OPS 0x04 +#define F10H_FP_RETIRED_SERIALIZING_OPS 0x05 +#define F10H_FP_CYCLES_SERIALIZING_OP_SCHEDULER 0x06 +/* Load/Store and TLB Events */ +#define F10H_SEGMENT_REG_LOADS 0x20 +#define F10H_PIPELINE_RESTART_SELFMOD_CODE 0x21 +#define F10H_PIPELINE_RESTART_PROBE_HIT 0x22 +#define F10H_LS_BUFFER_2_FILL 0x23 +#define F10H_LOCKED_OPERATIONS 0x24 +#define F10H_RETIRED_CLFLUSH_INSTRUCTIONS 0x26 +#define F10H_RETIRED_CPUID_INSTRUCTIONS 0x27 +#define F10H_CANCELLED_STORE_LOAD_FORWARD_OPS 0x2A +#define F10H_SMI_RECEIVED 0x2B +/* Data Cache Events */ +#define F10H_DATA_CACHE_ACCESSES 0x40 +#define F10H_DATA_CACHE_MISSES 0x41 +#define F10H_DATA_CACHE_REFILLS_FROM_L2 0x42 +#define F10H_DATA_CACHE_REFILLS_FROM_NORTHBRIDGE 0x43 +#define F10H_CACHE_LINES_EVICTED 0x44 +#define F10H_L1_DTLB_MISS 0x45 +#define F10H_L2_DTLB_MISS 0x46 +#define F10H_MISALIGNED_ACCESSES 0x47 +#define F10H_MICROARCH_LATE_CANCEL_OF_ACCESS 0x48 +#define F10H_MICROARCH_EARLY_CANCEL_OF_ACCESS 0x49 +#define F10H_SINGLE_BIT_ECC_ERRORS_RECORDED 0x4A +#define F10H_PREFETCH_INSTRUCTIONS_DISPATCHED 0x4B +#define F10H_DCACHE_MISSES_LOCKED_INSTRUCTIONS 0x4C +#define F10H_L1_DTLB_HIT 0x4D +#define F10H_INEFFECTIVE_SOFTWARE_PREFETCHS 0x52 +#define F10H_GLOBAL_TLB_FLUSHES 0x54 +#define F10H_MEMORY_REQUESTS_BY_TYPE 0x65 +#define F10H_DATA_PREFETCHER 0x67 +#define F10H_MAB_REQUESTS 0x68 +#define F10H_MAB_WAIT_CYCLES 0x69 +#define F10H_NORTHBRIDGE_READ_RESP_BY_COH_STATE 0x6C +#define F10H_OCTWORDS_WRITTEN_TO_SYSTEM 0x6D +#define F10H_CPU_CLOCKS_NOT_HALTED 0x76 +#define F10H_REQUESTS_TO_L2_CACHE 0x7D +#define F10H_L2_CACHE_MISSES 0x7E +#define F10H_L2_FILL0x7F +/* F10H_PAGE_SIZE_MISMATCHES (0x01C0): reserved on some revisions */ +/* Instruction Cache Events */ +#define F10H_INSTRUCTION_CACHE_FETCHES 0x80 +#define F10H_INSTRUCTION_CACHE_MISSES 0x81 +#define F10H_INSTRUCTION_CACHE_REFILLS_FROM_L2 0x82 +#define F10H_INSTRUCTION_CACHE_REFILLS_FROM_SYS 0x83 +#define F10H_L1_ITLB_MISS 0x84 +#define F10H_L2_ITLB_MISS 0x85 +#define F10H_PIPELINE_RESTART_INSTR_STREAM_PROBE 0x86 +#define
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: maxv
Date: Sat Feb 18 15:56:03 UTC 2017
Modified Files:
src/sys/arch/i386/i386: pmc.c
Log Message:
Fix a bug I introduced yesterday. The arguments are 8-bit ints, so the unit
gets truncated. By luck, the counters I was testing could accept a null
unit.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/i386/pmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/pmc.c
diff -u src/sys/arch/i386/i386/pmc.c:1.22 src/sys/arch/i386/i386/pmc.c:1.23
--- src/sys/arch/i386/i386/pmc.c:1.22 Fri Feb 17 12:10:40 2017
+++ src/sys/arch/i386/i386/pmc.c Sat Feb 18 15:56:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmc.c,v 1.22 2017/02/17 12:10:40 maxv Exp $ */
+/* $NetBSD: pmc.c,v 1.23 2017/02/18 15:56:03 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.22 2017/02/17 12:10:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.23 2017/02/18 15:56:03 maxv Exp $");
#include
#include
@@ -156,6 +156,8 @@ pmc_apply(pmc_state_t *pmc)
static void
pmc_start(pmc_state_t *pmc, struct x86_pmc_startstop_args *args)
{
+ uint64_t event, unit;
+
pmc->running = true;
/*
@@ -185,10 +187,10 @@ pmc_start(pmc_state_t *pmc, struct x86_p
break;
case PMC_TYPE_K7:
- args->event &= K7_EVTSEL_EVENT;
- args->unit = (args->unit << K7_EVTSEL_UNIT_SHIFT) &
+ event = (args->event & K7_EVTSEL_EVENT);
+ unit = (args->unit << K7_EVTSEL_UNIT_SHIFT) &
K7_EVTSEL_UNIT;
- pmc->evtval = args->event | args->unit | K7_EVTSEL_EN |
+ pmc->evtval = event | unit | K7_EVTSEL_EN |
((args->flags & PMC_SETUP_KERNEL) ? K7_EVTSEL_OS : 0) |
((args->flags & PMC_SETUP_USER) ? K7_EVTSEL_USR : 0) |
((args->flags & PMC_SETUP_EDGE) ? K7_EVTSEL_E : 0) |
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Sat Feb 18 14:48:43 UTC 2017
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Establish a softint for legacy, otherwise BOOM!
To generate a diff of this commit:
cvs rdiff -u -r1.484 -r1.485 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.484 src/sys/dev/pci/if_wm.c:1.485
--- src/sys/dev/pci/if_wm.c:1.484 Fri Feb 17 07:16:37 2017
+++ src/sys/dev/pci/if_wm.c Sat Feb 18 09:48:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.484 2017/02/17 12:16:37 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.485 2017/02/18 14:48:43 christos Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.484 2017/02/17 12:16:37 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.485 2017/02/18 14:48:43 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -4565,6 +4565,28 @@ wm_adjust_qnum(struct wm_softc *sc, int
sc->sc_nqueues = ncpu;
}
+static int
+wm_softint_establish(struct wm_softc *sc, int qidx, int intr_idx)
+{
+ struct wm_queue *wmq = >sc_queue[qidx];
+ wmq->wmq_id = qidx;
+ wmq->wmq_intr_idx = intr_idx;
+ wmq->wmq_si = softint_establish(SOFTINT_NET
+#ifdef WM_MPSAFE
+ | SOFTINT_MPSAFE
+#endif
+ , wm_handle_queue, wmq);
+ if (wmq->wmq_si != NULL)
+ return 0;
+
+ aprint_error_dev(sc->sc_dev, "unable to establish queue[%d] handler\n",
+ wmq->wmq_id);
+
+ pci_intr_disestablish(sc->sc_pc, sc->sc_ihs[wmq->wmq_intr_idx]);
+ sc->sc_ihs[wmq->wmq_intr_idx] = NULL;
+ return ENOMEM;
+}
+
/*
* Both single interrupt MSI and INTx can use this function.
*/
@@ -4598,7 +4620,8 @@ wm_setup_legacy(struct wm_softc *sc)
aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr);
sc->sc_nintrs = 1;
- return 0;
+
+ return wm_softint_establish(sc, 0, 0);
}
static int
@@ -4676,20 +4699,8 @@ wm_setup_msix(struct wm_softc *sc)
"for TX and RX interrupting at %s\n", intrstr);
}
sc->sc_ihs[intr_idx] = vih;
- wmq->wmq_id = qidx;
- wmq->wmq_intr_idx = intr_idx;
- wmq->wmq_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
- wm_handle_queue, wmq);
- if (wmq->wmq_si == NULL) {
- aprint_error_dev(sc->sc_dev,
- "unable to establish queue[%d] handler\n",
- wmq->wmq_id);
- pci_intr_disestablish(sc->sc_pc,
- sc->sc_ihs[wmq->wmq_intr_idx]);
- sc->sc_ihs[wmq->wmq_intr_idx] = NULL;
+ if (wm_softint_establish(sc, qidx, intr_idx) != 0)
goto fail;
- }
-
txrx_established++;
intr_idx++;
}
CVS commit: src/sys/arch/amd64
Module Name:src Committed By: maxv Date: Sat Feb 18 14:43:35 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/amd64/include: pmc.h Log Message: PERFCTRS -> PMC (not implemented anyway) To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/include/pmc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.50 src/sys/arch/amd64/conf/ALL:1.51 --- src/sys/arch/amd64/conf/ALL:1.50 Thu Feb 16 08:45:42 2017 +++ src/sys/arch/amd64/conf/ALL Sat Feb 18 14:43:34 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.50 2017/02/16 08:45:42 knakahara Exp $ +# $NetBSD: ALL,v 1.51 2017/02/18 14:43:34 maxv Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.50 $" +#ident "ALL-$Revision: 1.51 $" maxusers 64 # estimated number of users @@ -39,8 +39,7 @@ powernow0 at cpu0 # AMD PowerNow! and C viac7temp* at cpu? # VIA C7 temperature sensor vmt0 at cpu0 # VMware Tools -# doesn't work with MP just yet.. -options PERFCTRS # performance-monitoring counters support +options PMC # performance-monitoring counters support options MULTIBOOT # Multiboot support (see multiboot(8)) Index: src/sys/arch/amd64/include/pmc.h diff -u src/sys/arch/amd64/include/pmc.h:1.2 src/sys/arch/amd64/include/pmc.h:1.3 --- src/sys/arch/amd64/include/pmc.h:1.2 Thu Mar 20 20:45:32 2014 +++ src/sys/arch/amd64/include/pmc.h Sat Feb 18 14:43:35 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: pmc.h,v 1.2 2014/03/20 20:45:32 christos Exp $ */ +/* $NetBSD: pmc.h,v 1.3 2017/02/18 14:43:35 maxv Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -39,33 +39,12 @@ */ struct x86_64_pmc_info_args; int pmc_info(struct proc *, struct x86_64_pmc_info_args *, - register_t *); +register_t *); struct x86_64_pmc_startstop_args; int pmc_startstop(struct proc *, struct x86_64_pmc_startstop_args *, - register_t *); +register_t *); struct x86_64_pmc_read_args; int pmc_read(struct proc *, struct x86_64_pmc_read_args *, - register_t *); +register_t *); /* END LEGACY PMC SUPPORT */ - -#define pmc_md_fork(p1,p2) -#define pmc_get_num_counters() (0) -#define pmc_get_counter_type(c) (0) -#define pmc_save_context(p) -#define pmc_restore_context(p) -#define pmc_enable_counter(p,c) -#define pmc_disable_counter(p,c) -#define pmc_accumulate(p1,p2) -#define pmc_process_exit(p1) -#define pmc_counter_isconfigured(p,c) (0) -#define pmc_counter_isrunning(p,c) (0) -#define pmc_start_profiling(c,f) (0) -#define pmc_stop_profiling(c) (0) -#define pmc_alloc_kernel_counter(c,f) (0) -#define pmc_free_kernel_counter(c) (0) -#define pmc_configure_counter(p,c,f) (0) -#define pmc_get_counter_value(p,c,f,pv) (0) - -#define PMC_ENABLED(p) (0) - #endif
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Sat Feb 18 14:36:32 UTC 2017 Modified Files: src/sys/arch/i386/conf: ALL GENERIC NET4501 src/sys/arch/i386/include: pmc.h src/sys/arch/x86/x86: sys_machdep.c Log Message: There is currently an ugly mix between the PERFCTRS subsystem (MI), and i386's own PMC interface (MD). Stop using PERFCTRS and use PMC instead. While here remove some unused flags, which are wrong on the latest CPUs anyway. To generate a diff of this commit: cvs rdiff -u -r1.411 -r1.412 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1147 -r1.1148 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.89 -r1.90 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/include/pmc.h cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/x86/sys_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.411 src/sys/arch/i386/conf/ALL:1.412 --- src/sys/arch/i386/conf/ALL:1.411 Thu Jan 12 05:24:36 2017 +++ src/sys/arch/i386/conf/ALL Sat Feb 18 14:36:32 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.411 2017/01/12 05:24:36 ryo Exp $ +# $NetBSD: ALL,v 1.412 2017/02/18 14:36:32 maxv Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.411 $" +#ident "ALL-$Revision: 1.412 $" maxusers 64 # estimated number of users @@ -40,8 +40,7 @@ viac7temp* at cpu? # VIA C7 temperature vmt0 at cpu0 # VMware Tools options MTRR # memory-type range register syscall support -# doesn't work with MP just yet.. -options PERFCTRS # performance-monitoring counters support +options PMC # performance-monitoring counters support options MULTIBOOT # Multiboot support (see multiboot(8)) Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1147 src/sys/arch/i386/conf/GENERIC:1.1148 --- src/sys/arch/i386/conf/GENERIC:1.1147 Fri Feb 17 12:10:40 2017 +++ src/sys/arch/i386/conf/GENERIC Sat Feb 18 14:36:32 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1147 2017/02/17 12:10:40 maxv Exp $ +# $NetBSD: GENERIC,v 1.1148 2017/02/18 14:36:32 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1147 $" +#ident "GENERIC-$Revision: 1.1148 $" maxusers 64 # estimated number of users @@ -42,7 +42,7 @@ viac7temp* at cpu? # VIA C7 temperature vmt0 at cpu0 # VMware Tools options MTRR # memory-type range register syscall support -#options PERFCTRS # performance-monitoring counters support +#options PMC # performance-monitoring counters support options MULTIBOOT # Multiboot support (see multiboot(8)) Index: src/sys/arch/i386/conf/NET4501 diff -u src/sys/arch/i386/conf/NET4501:1.89 src/sys/arch/i386/conf/NET4501:1.90 --- src/sys/arch/i386/conf/NET4501:1.89 Fri Aug 21 01:52:08 2015 +++ src/sys/arch/i386/conf/NET4501 Sat Feb 18 14:36:32 2017 @@ -1,4 +1,4 @@ -# $NetBSD: NET4501,v 1.89 2015/08/21 01:52:08 uebayasi Exp $ +# $NetBSD: NET4501,v 1.90 2017/02/18 14:36:32 maxv Exp $ # # NET4501 -- kernel configuration for a Soekris Engineering net4501 # single-board computer. @@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "NET4501-$Revision: 1.89 $" +#ident "NET4501-$Revision: 1.90 $" maxusers 32 # estimated number of users @@ -24,7 +24,7 @@ makeoptions COPTS="-Os" #options USER_LDT # user-settable LDT; used by WINE #options MTRR # memory-type range register syscall support -#options PERFCTRS # performance-monitoring counters support +#options PMC # performance-monitoring counters support # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 Index: src/sys/arch/i386/include/pmc.h diff -u src/sys/arch/i386/include/pmc.h:1.9 src/sys/arch/i386/include/pmc.h:1.10 --- src/sys/arch/i386/include/pmc.h:1.9 Fri Feb 17 12:10:40 2017 +++ src/sys/arch/i386/include/pmc.h Sat Feb 18 14:36:32 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: pmc.h,v 1.9 2017/02/17 12:10:40 maxv Exp $ */ +/* $NetBSD: pmc.h,v 1.10 2017/02/18 14:36:32 maxv Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -52,17 +52,9 @@ * Each PMC event on the x86 is associated with a processor unit. We * encode the unit in the upper 16 bits of the event ID. */ -#define __PMC_EVID_EVENT_MASK 0x -#define __PMC_EVID_UNIT_MASK 0x - #define __PMC_UNIT(x) ((x) << 16) -#define __PMC_GET_UNIT(x) (((x) & __PMC_EVID_UNIT_MASK) >> 16) -#define __PMC_GET_EVENT(x) ((x) & __PMC_EVID_EVENT_MASK) #if defined(_KERNEL) -/* - * LEGACY PMC
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: flxd Date: Sat Feb 18 13:56:29 UTC 2017 Modified Files: src/sys/arch/shark/ofw: vlpci.c Log Message: Let vlpci attach instead of ofbus. OK jakllsch@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/shark/ofw/vlpci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/shark/ofw/vlpci.c diff -u src/sys/arch/shark/ofw/vlpci.c:1.1 src/sys/arch/shark/ofw/vlpci.c:1.2 --- src/sys/arch/shark/ofw/vlpci.c:1.1 Fri Feb 17 18:07:51 2017 +++ src/sys/arch/shark/ofw/vlpci.c Sat Feb 18 13:56:29 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: vlpci.c,v 1.1 2017/02/17 18:07:51 jakllsch Exp $ */ +/* $NetBSD: vlpci.c,v 1.2 2017/02/18 13:56:29 flxd Exp $ */ /* * Copyright (c) 2017 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.1 2017/02/17 18:07:51 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.2 2017/02/18 13:56:29 flxd Exp $"); #include "opt_pci.h" #include "pci.h" @@ -91,7 +91,7 @@ vlpci_match(device_t parent, struct cfda if (of_compatible(oba->oba_phandle, compat_strings) < 0) return 0; - return 1; + return 2; /* beat generic ofbus */ } static void
