CVS commit: src/sys/dev/usb

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Tue Oct 31 00:57:14 UTC 2017

Modified Files:
src/sys/dev/usb: if_urtwn.c

Log Message:
Also attach the RTL8192EU from TP-LINK


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/usb/if_urtwn.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/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.53 src/sys/dev/usb/if_urtwn.c:1.54
--- src/sys/dev/usb/if_urtwn.c:1.53	Wed May  3 15:34:05 2017
+++ src/sys/dev/usb/if_urtwn.c	Tue Oct 31 00:57:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urtwn.c,v 1.53 2017/05/03 15:34:05 jnemeth Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.54 2017/10/31 00:57:14 khorben Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53 2017/05/03 15:34:05 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.54 2017/10/31 00:57:14 khorben Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -195,6 +195,7 @@ static const struct urtwn_dev {
 
 	/* URTWN_RTL8192EU */
 	URTWN_RTL8192EU_DEV(REALTEK,	RTL8192EU),
+	URTWN_RTL8192EU_DEV(TPLINK,	RTL8192EU),
 };
 #undef URTWN_DEV
 #undef URTWN_RTL8188E_DEV

CVS commit: src/sys/dev/usb

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Tue Oct 31 00:30:07 UTC 2017

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Re-generate


To generate a diff of this commit:
cvs rdiff -u -r1.735 -r1.736 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.736 -r1.737 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.735 src/sys/dev/usb/usbdevs.h:1.736
--- src/sys/dev/usb/usbdevs.h:1.735	Thu Oct 19 23:55:02 2017
+++ src/sys/dev/usb/usbdevs.h	Tue Oct 31 00:30:07 2017
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.735 2017/10/19 23:55:02 jmcneill Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.736 2017/10/31 00:30:07 khorben Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.742 2017/10/19 23:54:42 jmcneill Exp
+ *	NetBSD: usbdevs,v 1.743 2017/10/31 00:20:51 khorben Exp
  */
 
 /*
@@ -3290,6 +3290,7 @@
 
 /* TP-Link products */
 #define	USB_PRODUCT_TPLINK_RTL8192CU	0x0100		/* RTL8192CU */
+#define	USB_PRODUCT_TPLINK_RTL8192EU	0x0109		/* RTL8192EU */
 #define	USB_PRODUCT_TPLINK_RTL8188EU	0x010c		/* RTL8188EU */
 
 /* Trek Technology products */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.736 src/sys/dev/usb/usbdevs_data.h:1.737
--- src/sys/dev/usb/usbdevs_data.h:1.736	Thu Oct 19 23:55:02 2017
+++ src/sys/dev/usb/usbdevs_data.h	Tue Oct 31 00:30:07 2017
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.736 2017/10/19 23:55:02 jmcneill Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.737 2017/10/31 00:30:07 khorben Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.742 2017/10/19 23:54:42 jmcneill Exp
+ *	NetBSD: usbdevs,v 1.743 2017/10/31 00:20:51 khorben Exp
  */
 
 /*
@@ -4480,6 +4480,8 @@ static const uint16_t usb_products[] = {
 	8525, 6353, 4878, 5670, 0,
 	USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8192CU, 
 	5090, 0,
+	USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8192EU, 
+	16460, 0,
 	USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_RTL8188EU, 
 	5100, 0,
 	USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE, 
@@ -6974,7 +6976,7 @@ static const char usb_words[] = { "." 
 	"RTL8191CU\0" /* 1 refs @ 16431 */
 	"RTL8192CE\0" /* 1 refs @ 16441 */
 	"RTL8187B\0" /* 3 refs @ 16451 */
-	"RTL8192EU\0" /* 1 refs @ 16460 */
+	"RTL8192EU\0" /* 2 refs @ 16460 */
 	"RTL8712\0" /* 1 refs @ 16470 */
 	"RTL8713\0" /* 1 refs @ 16478 */
 	"BlackBerry\0" /* 3 refs @ 16486 */

CVS commit: src/sys/dev/usb

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Tue Oct 31 00:20:51 UTC 2017

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add the TP-LINK TL-WN823N (version 2)


To generate a diff of this commit:
cvs rdiff -u -r1.742 -r1.743 src/sys/dev/usb/usbdevs

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/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.742 src/sys/dev/usb/usbdevs:1.743
--- src/sys/dev/usb/usbdevs:1.742	Thu Oct 19 23:54:42 2017
+++ src/sys/dev/usb/usbdevs	Tue Oct 31 00:20:51 2017
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.742 2017/10/19 23:54:42 jmcneill Exp $
+$NetBSD: usbdevs,v 1.743 2017/10/31 00:20:51 khorben Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -3283,6 +3283,7 @@ product TOSHIBA HSDPA_MODEM_EU870DT1	0x1
 
 /* TP-Link products */
 product TPLINK RTL8192CU	0x0100	RTL8192CU
+product TPLINK RTL8192EU	0x0109	RTL8192EU
 product TPLINK RTL8188EU	0x010c	RTL8188EU
 
 /* Trek Technology products */

CVS commit: xsrc/external/mit/xf86-video-suncg14/dist/src

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Mon Oct 30 22:09:54 UTC 2017

Modified Files:
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14.h cg14_accel.c
cg14_render.c

Log Message:
support PictOpAdd with A8 source and ARGB/ABGR destination
now labels in windowmaker look right again


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_render.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h:1.11 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h:1.12
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h:1.11	Tue Apr 29 08:40:58 2014
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h	Mon Oct 30 22:09:54 2017
@@ -144,6 +144,8 @@ void CG14Comp_Over32Mask32_noalpha(Cg14P
 		   uint32_t, uint32_t, uint32_t, int, int);
 void CG14Comp_Add8(Cg14Ptr, uint32_t, uint32_t, uint32_t, uint32_t,
int, int);
+void CG14Comp_Add8_32(Cg14Ptr, uint32_t, uint32_t, uint32_t, uint32_t,
+   int, int);
 void CG14Comp_Add32(Cg14Ptr, uint32_t, uint32_t, uint32_t, uint32_t,
int, int);
 
Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.11 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.12
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c:1.11	Sat Jan 14 00:20:16 2017
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_accel.c	Mon Oct 30 22:09:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cg14_accel.c,v 1.11 2017/01/14 00:20:16 macallan Exp $ */
+/* $NetBSD: cg14_accel.c,v 1.12 2017/10/30 22:09:54 macallan Exp $ */
 /*
  * Copyright (c) 2013 Michael Lorenz
  * All rights reserved.
@@ -995,9 +995,22 @@ CG14Composite(PixmapPtr pDst, int srcX, 
 case PICT_a8:
 	src = p->srcoff +
 	(srcY * p->srcpitch) + srcX;
-	dst = dstoff + (dstY * dstpitch) + dstX;
-	CG14Comp_Add8(p, src, p->srcpitch,
-	dst, dstpitch, width, height);
+	if (p->dstformat == PICT_a8) {
+		dst = dstoff + 
+		  (dstY * dstpitch) + dstX;
+		CG14Comp_Add8(p,
+		src, p->srcpitch,
+		dst, dstpitch,
+		width, height);
+	} else {
+		dst = dstoff + 
+		  (dstY * dstpitch) +
+		  (dstX << 2);
+		CG14Comp_Add8_32(p,
+		src, p->srcpitch,
+		dst, dstpitch,
+		width, height);
+	}
 	break;
 case PICT_a8r8g8b8:
 case PICT_x8r8g8b8:

Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_render.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_render.c:1.9 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_render.c:1.10
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_render.c:1.9	Fri Sep 16 22:07:25 2016
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_render.c	Mon Oct 30 22:09:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cg14_render.c,v 1.9 2016/09/16 22:07:25 macallan Exp $ */
+/* $NetBSD: cg14_render.c,v 1.10 2017/10/30 22:09:54 macallan Exp $ */
 /*
  * Copyright (c) 2013 Michael Lorenz
  * All rights reserved.
@@ -395,6 +395,77 @@ void CG14Comp_Add8(Cg14Ptr p,
 	}
 }
 
+void CG14Comp_Add8_32(Cg14Ptr p,
+   uint32_t src, uint32_t srcpitch,
+   uint32_t dst, uint32_t dstpitch,
+   int width, int height)
+{
+	int line;
+	uint32_t srcx, dstx, srcoff, dstoff;
+	int pre, full, part, x;
+	uint8_t *d;
+	char buffer[256];
+	ENTER;
+
+	srcoff = src & 7;
+	src &= ~7;
+	dstoff = dst & 7;
+	dst &= ~7;
+	full = width >> 5;	/* chunks of 32 */
+	part = width & 31;	/* leftovers */
+
+#ifdef SX_DEBUG
+	xf86Msg(X_ERROR, "%d %d, %d x %d, %d %d\n", srcpitch, dstpitch,
+	width, height, full, part);
+#endif
+	/* we do this up to 32 pixels at a time */
+	for (line = 0; line < height; line++) {
+		srcx = src;
+		dstx = dst;
+		for (x = 0; x < full; x++) {
+			/* load source bytes */
+			write_sx_io(p, srcx, SX_LDB(8, 31, srcoff));
+			/* load alpha from destination */
+			write_sx_io(p, dstx, SX_LDUC0(40, 31, dstoff));
+			write_sx_reg(p, SX_INSTRUCTIONS,
+			SX_ADDV(8, 40, 72, 15));
+			write_sx_reg(p, SX_INSTRUCTIONS,
+			SX_ADDV(24, 56, 88, 15));
+			/* write clamped values back into dest alpha */
+			write_sx_io(p, dstx, SX_STUC0C(72, 31, dstoff));
+			srcx += 32;
+			dstx += 128;
+		}
+
+		if (part > 0) {
+			/* do leftovers */
+			write_sx_io(p, srcx, SX_LDB(8, part - 1, srcoff));
+			write_sx_io(p, dstx, SX_LDUC0(40, part - 1, dstoff));
+			if (part > 16) {
+write_sx_reg(p, SX_INSTRUCTIONS,
+SX_ADDV(8, 40, 72, 15));
+write_sx_reg(p, 

CVS commit: src/sys/arch/sparc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Mon Oct 30 21:41:39 UTC 2017

Modified Files:
src/sys/arch/sparc/dev: sxreg.h

Log Message:
add load & store instructions for channel data type
mostly for Xorg


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/dev/sxreg.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/sparc/dev/sxreg.h
diff -u src/sys/arch/sparc/dev/sxreg.h:1.13 src/sys/arch/sparc/dev/sxreg.h:1.14
--- src/sys/arch/sparc/dev/sxreg.h:1.13	Fri Jan 13 21:49:46 2017
+++ src/sys/arch/sparc/dev/sxreg.h	Mon Oct 30 21:41:39 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: sxreg.h,v 1.13 2017/01/13 21:49:46 macallan Exp $	*/
+/*	$NetBSD: sxreg.h,v 1.14 2017/10/30 21:41:39 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -158,6 +158,14 @@
 SX_UQUAD_16 | (dreg << 7) | (o))
 #define SX_LDUQ24(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
 SX_UQUAD_24 | (dreg << 7) | (o))
+#define SX_LDUC0(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_UCHAN_0 | (dreg << 7) | (o))
+#define SX_LDUC8(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_UCHAN_8 | (dreg << 7) | (o))
+#define SX_LDUC16(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_UCHAN_16 | (dreg << 7) | (o))
+#define SX_LDUC24(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_UCHAN_24 | (dreg << 7) | (o))
 #define SX_ST(sreg, cnt, o)  (0x8000 | ((cnt) << 23) | SX_STORE | \
 SX_LONG | (sreg << 7) | (o))
 #define SX_STM(sreg, cnt, o)  (0x8000 | ((cnt) << 23) | SX_STORE_MASK | \
@@ -184,6 +192,16 @@
 SX_UQUAD_16 | (sreg << 7) | (o))
 #define SX_STUQ24(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
 SX_UQUAD_24 | (sreg << 7) | (o))
+#define SX_STUC0(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_UCHAN_0 | (sreg << 7) | (o))
+#define SX_STUC0C(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE_CLAMP | \
+SX_UCHAN_0 | (sreg << 7) | (o))
+#define SX_STUC8(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_UCHAN_8 | (sreg << 7) | (o))
+#define SX_STUC16(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_UCHAN_16 | (sreg << 7) | (o))
+#define SX_STUC24(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_UCHAN_24 | (sreg << 7) | (o))
 
 /* ROP and SELECT instructions */
 #define SX_ROPB	(0x0 << 21)	/* mask bits apply to bytes */

CVS commit: src/sys/lib/libkern/arch/x86_64

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Oct 30 17:13:39 UTC 2017

Modified Files:
src/sys/lib/libkern/arch/x86_64: random.S scanc.S skpc.S

Log Message:
Add END().


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libkern/arch/x86_64/random.S \
src/sys/lib/libkern/arch/x86_64/scanc.S \
src/sys/lib/libkern/arch/x86_64/skpc.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/lib/libkern/arch/x86_64/random.S
diff -u src/sys/lib/libkern/arch/x86_64/random.S:1.2 src/sys/lib/libkern/arch/x86_64/random.S:1.3
--- src/sys/lib/libkern/arch/x86_64/random.S:1.2	Mon Apr 28 20:24:06 2008
+++ src/sys/lib/libkern/arch/x86_64/random.S	Mon Oct 30 17:13:39 2017
@@ -1,6 +1,6 @@
-/*	$NetBSD: random.S,v 1.2 2008/04/28 20:24:06 martin Exp $	*/
+/*	$NetBSD: random.S,v 1.3 2017/10/30 17:13:39 maxv Exp $	*/
 
-/*-
+/*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -88,3 +88,4 @@ ENTRY(random)
 	subl	$0x7fff,%eax
 	movl	%eax,randseed(%rip)
 	ret
+END(random)
Index: src/sys/lib/libkern/arch/x86_64/scanc.S
diff -u src/sys/lib/libkern/arch/x86_64/scanc.S:1.2 src/sys/lib/libkern/arch/x86_64/scanc.S:1.3
--- src/sys/lib/libkern/arch/x86_64/scanc.S:1.2	Mon Apr 28 20:24:06 2008
+++ src/sys/lib/libkern/arch/x86_64/scanc.S	Mon Oct 30 17:13:39 2017
@@ -1,6 +1,6 @@
-/*	$NetBSD: scanc.S,v 1.2 2008/04/28 20:24:06 martin Exp $	*/
+/*	$NetBSD: scanc.S,v 1.3 2017/10/30 17:13:39 maxv Exp $	*/
 
-/*-
+/*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -53,3 +53,4 @@ ENTRY(scanc)
 2:
 	movl	%ecx,%eax
 	ret
+END(scanc)
Index: src/sys/lib/libkern/arch/x86_64/skpc.S
diff -u src/sys/lib/libkern/arch/x86_64/skpc.S:1.2 src/sys/lib/libkern/arch/x86_64/skpc.S:1.3
--- src/sys/lib/libkern/arch/x86_64/skpc.S:1.2	Mon Apr 28 20:24:06 2008
+++ src/sys/lib/libkern/arch/x86_64/skpc.S	Mon Oct 30 17:13:39 2017
@@ -1,6 +1,6 @@
-/*	$NetBSD: skpc.S,v 1.2 2008/04/28 20:24:06 martin Exp $	*/
+/*	$NetBSD: skpc.S,v 1.3 2017/10/30 17:13:39 maxv Exp $	*/
 
-/*-
+/*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -47,3 +47,4 @@ ENTRY(skpc)
 1:
 	movl	%ecx,%eax
 	ret
+END(skpc)

CVS commit: src/sys/arch/amd64/amd64

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Oct 30 17:06:42 UTC 2017

Modified Files:
src/sys/arch/amd64/amd64: copy.S cpufunc.S linux32_sigcode.S
linux_sigcode.S vector.S

Log Message:
Always use END() markers when declaring functions in assembly, so that ld
can compute the size of the functions. A few remain.

While here, fix a bug in the INTRSTUB macro: we are falling through
resume_, but it is aligned, so it looks like we're executing the inter-
function padding - which probably happens to contain NOPs, but that's
still bad.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/amd64/copy.S
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/amd64/linux32_sigcode.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/amd64/linux_sigcode.S
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amd64/amd64/vector.S

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/amd64/copy.S
diff -u src/sys/arch/amd64/amd64/copy.S:1.26 src/sys/arch/amd64/amd64/copy.S:1.27
--- src/sys/arch/amd64/amd64/copy.S:1.26	Tue Oct 17 07:02:50 2017
+++ src/sys/arch/amd64/amd64/copy.S	Mon Oct 30 17:06:42 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: copy.S,v 1.26 2017/10/17 07:02:50 maxv Exp $	*/
+/*	$NetBSD: copy.S,v 1.27 2017/10/30 17:06:42 maxv Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -105,6 +105,7 @@ ENTRY(do_pmap_load)
 	popq	%rdi
 	leaveq
 	ret
+END(do_pmap_load)
 
 /*
  * SMAP functions. ret+int3+int3 is patched dynamically to STAC/CLAC.
@@ -116,6 +117,7 @@ ENTRY(smap_enable)
 	int3
 	int3
 	ret
+END(smap_enable)
 
 ENTRY(smap_disable)
 .Lstacpatch:
@@ -123,6 +125,7 @@ ENTRY(smap_disable)
 	int3
 	int3
 	ret
+END(smap_disable)
 
 /*
  * Copy routines from and to userland, plus a few more. See the
@@ -190,6 +193,7 @@ ENTRY(kcopy)
 .Lkcopy_end:
 	xorq	%rax,%rax
 	ret
+END(kcopy)
 
 ENTRY(copyout)
 	DEFERRED_SWITCH_CHECK
@@ -219,6 +223,7 @@ ENTRY(copyout)
 	xorl	%eax,%eax
 	ret
 	DEFERRED_SWITCH_CALL
+END(copyout)
 
 ENTRY(copyin)
 	DEFERRED_SWITCH_CHECK
@@ -249,6 +254,7 @@ ENTRY(copyin)
 	xorl	%eax,%eax
 	ret
 	DEFERRED_SWITCH_CALL
+END(copyin)
 
 NENTRY(copy_efault)
 	movq	$EFAULT,%rax
@@ -308,6 +314,7 @@ ENTRY(copyoutstr)
 	movq	$ENAMETOOLONG,%rax
 	jmp	copystr_return
 	DEFERRED_SWITCH_CALL
+END(copyoutstr)
 
 ENTRY(copyinstr)
 	DEFERRED_SWITCH_CHECK
@@ -351,6 +358,7 @@ ENTRY(copyinstr)
 	movq	$ENAMETOOLONG,%rax
 	jmp	copystr_return
 	DEFERRED_SWITCH_CALL
+END(copyinstr)
 
 ENTRY(copystr_efault)
 	movl	$EFAULT,%eax
@@ -394,7 +402,7 @@ ENTRY(copystr)
 	movq	%r8,(%rcx)
 
 7:	ret
-
+END(copystr)
 
 ENTRY(fuswintr)
 	cmpl	$TLBSTATE_VALID,CPUVAR(TLBSTATE)
@@ -412,6 +420,7 @@ ENTRY(fuswintr)
 
 	movq	$0,PCB_ONFAULT(%rcx)
 	ret
+END(fuswintr)
 
 ENTRY(fubyte)
 	DEFERRED_SWITCH_CHECK
@@ -429,6 +438,7 @@ ENTRY(fubyte)
 	movq	$0,PCB_ONFAULT(%rcx)
 	ret
 	DEFERRED_SWITCH_CALL
+END(fubyte)
 
 ENTRY(suswintr)
 	cmpl	$TLBSTATE_VALID,CPUVAR(TLBSTATE)
@@ -447,6 +457,7 @@ ENTRY(suswintr)
 	xorq	%rax,%rax
 	movq	%rax,PCB_ONFAULT(%rcx)
 	ret
+END(suswintr)
 
 ENTRY(subyte)
 	DEFERRED_SWITCH_CHECK
@@ -466,6 +477,7 @@ ENTRY(subyte)
 	movq	%rax,PCB_ONFAULT(%rcx)
 	ret
 	DEFERRED_SWITCH_CALL
+END(subyte)
 
 /*
  * These are the same, but must reside at different addresses,
@@ -476,16 +488,19 @@ ENTRY(fusuintrfailure)
 	movq	$0,PCB_ONFAULT(%rcx)
 	movl	$-1,%eax
 	ret
+END(fusuintrfailure)
 
 ENTRY(fusufailure)
 	callq	smap_enable
 	movq	$0,PCB_ONFAULT(%rcx)
 	movl	$-1,%eax
 	ret
+END(fusufailure)
 
 ENTRY(fusuaddrfault)
 	movl	$-1,%eax
 	ret
+END(fusuaddrfault)
 
 /*
  * Compare-and-swap the 64-bit integer in the user-space.
@@ -516,6 +531,7 @@ ENTRY(ucas_64)
 	xorq	%rax,%rax
 	ret
 	DEFERRED_SWITCH_CALL
+END(ucas_64)
 
 /*
  * int	ucas_32(volatile int32_t *uptr, int32_t old, int32_t new, int32_t *ret);
@@ -544,6 +560,7 @@ ENTRY(ucas_32)
 	xorq	%rax,%rax
 	ret
 	DEFERRED_SWITCH_CALL
+END(ucas_32)
 
 ENTRY(ucas_efault)
 	movq	$EFAULT,%rax

Index: src/sys/arch/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.29 src/sys/arch/amd64/amd64/cpufunc.S:1.30
--- src/sys/arch/amd64/amd64/cpufunc.S:1.29	Sun Oct 15 11:31:00 2017
+++ src/sys/arch/amd64/amd64/cpufunc.S	Mon Oct 30 17:06:42 2017
@@ -1,6 +1,6 @@
-/*	$NetBSD: cpufunc.S,v 1.29 2017/10/15 11:31:00 maxv Exp $	*/
+/*	$NetBSD: cpufunc.S,v 1.30 2017/10/30 17:06:42 maxv Exp $	*/
 
-/*-
+/*
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -51,23 +51,28 @@
 ENTRY(x86_lfence)
 	lfence
 	ret
+END(x86_lfence)
 
 ENTRY(x86_sfence)
 	sfence
 	ret
+END(x86_sfence)
 
 ENTRY(x86_mfence)
 	mfence
 	ret
+END(x86_mfence)
 
 #ifndef XEN
 ENTRY(invlpg)
 	invlpg	(%rdi)
 	ret
+END(invlpg)
 
 ENTRY(lidt)
 	lidt	(%rdi)
 	ret
+END(lidt)
 
 ENTRY(lldt)
 	cmpl	%edi, CPUVAR(CURLDT)
@@ -77,51 +82,63 @@ ENTRY(lldt)
 	movl	%edi, CPUVAR(CURLDT)
 	lldt	%di
 	ret

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Oct 30 16:01:19 UTC 2017

Modified Files:
src/sys/net: if_l2tp.c if_tap.c if_tun.c if_vlan.c

Log Message:
Set IFEF_NO_LINK_STATE_CHANGE flag to pseudo devices that don't use 
if_link_state_change


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_tap.c
cvs rdiff -u -r1.140 -r1.141 src/sys/net/if_tun.c
cvs rdiff -u -r1.105 -r1.106 src/sys/net/if_vlan.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/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.13 src/sys/net/if_l2tp.c:1.14
--- src/sys/net/if_l2tp.c:1.13	Mon Oct 30 11:24:04 2017
+++ src/sys/net/if_l2tp.c	Mon Oct 30 16:01:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_l2tp.c,v 1.13 2017/10/30 11:24:04 knakahara Exp $	*/
+/*	$NetBSD: if_l2tp.c,v 1.14 2017/10/30 16:01:19 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.13 2017/10/30 11:24:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.14 2017/10/30 16:01:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -265,7 +265,8 @@ l2tpattach0(struct l2tp_softc *sc)
 	sc->l2tp_ec.ec_if.if_addrlen = 0;
 	sc->l2tp_ec.ec_if.if_mtu= L2TP_MTU;
 	sc->l2tp_ec.ec_if.if_flags  = IFF_POINTOPOINT|IFF_MULTICAST|IFF_SIMPLEX;
-	sc->l2tp_ec.ec_if.if_extflags  = IFEF_OUTPUT_MPSAFE|IFEF_START_MPSAFE;
+	sc->l2tp_ec.ec_if.if_extflags  = IFEF_OUTPUT_MPSAFE |
+	IFEF_START_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
 	sc->l2tp_ec.ec_if.if_ioctl  = l2tp_ioctl;
 	sc->l2tp_ec.ec_if.if_output = l2tp_output;
 	sc->l2tp_ec.ec_if.if_type   = IFT_L2TP;

Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.100 src/sys/net/if_tap.c:1.101
--- src/sys/net/if_tap.c:1.100	Mon Oct 23 09:32:33 2017
+++ src/sys/net/if_tap.c	Mon Oct 30 16:01:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.100 2017/10/23 09:32:33 msaitoh Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.101 2017/10/30 16:01:19 ozaki-r Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.100 2017/10/23 09:32:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.101 2017/10/30 16:01:19 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -370,6 +370,7 @@ tap_attach(device_t parent, device_t sel
 	strcpy(ifp->if_xname, device_xname(self));
 	ifp->if_softc	= sc;
 	ifp->if_flags	= IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE;
 	ifp->if_ioctl	= tap_ioctl;
 	ifp->if_start	= tap_start;
 	ifp->if_stop	= tap_stop;

Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.140 src/sys/net/if_tun.c:1.141
--- src/sys/net/if_tun.c:1.140	Wed Oct 25 08:12:40 2017
+++ src/sys/net/if_tun.c	Mon Oct 30 16:01:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tun.c,v 1.140 2017/10/25 08:12:40 maya Exp $	*/
+/*	$NetBSD: if_tun.c,v 1.141 2017/10/30 16:01:19 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1988, Julian Onions 
@@ -19,7 +19,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.140 2017/10/25 08:12:40 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.141 2017/10/30 16:01:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -247,6 +247,7 @@ tunattach0(struct tun_softc *tp)
 	ifp->if_start = tunstart;
 #endif
 	ifp->if_flags = IFF_POINTOPOINT;
+	ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE;
 	ifp->if_type = IFT_TUNNEL;
 	ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	ifp->if_collisions = 0;

Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.105 src/sys/net/if_vlan.c:1.106
--- src/sys/net/if_vlan.c:1.105	Mon Oct 23 09:31:18 2017
+++ src/sys/net/if_vlan.c	Mon Oct 30 16:01:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vlan.c,v 1.105 2017/10/23 09:31:18 msaitoh Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.106 2017/10/30 16:01:19 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.105 2017/10/23 09:31:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.106 2017/10/30 16:01:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -338,7 +338,7 @@ vlan_clone_create(struct if_clone *ifc, 
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_softc = ifv;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_extflags = IFEF_START_MPSAFE;
+	ifp->if_extflags = IFEF_START_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
 	ifp->if_start = vlan_start;
 	ifp->if_transmit = vlan_transmit;
 	ifp->if_ioctl = vlan_ioctl;

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Oct 30 15:59:24 UTC 2017

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/net: net_common.sh
src/tests/net/ipsec: Makefile
Added Files:
src/tests/net/ipsec: natt_terminator.c t_ipsec_natt.sh

Log Message:
Add test cases of NAT-T (transport mode)

A small C program is added to make a special socket (UDP_ENCAP_ESPINUDP)
and keep it to handle UDP-encapsulated ESP packets.


To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.764 -r1.765 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.22 -r1.23 src/tests/net/net_common.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/net/ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/ipsec/natt_terminator.c \
src/tests/net/ipsec/t_ipsec_natt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.227 src/distrib/sets/lists/debug/mi:1.228
--- src/distrib/sets/lists/debug/mi:1.227	Tue Oct 10 19:31:56 2017
+++ src/distrib/sets/lists/debug/mi	Mon Oct 30 15:59:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.227 2017/10/10 19:31:56 christos Exp $
+# $NetBSD: mi,v 1.228 2017/10/30 15:59:23 ozaki-r Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -2280,6 +2280,7 @@
 ./usr/libdata/debug/usr/tests/net/if/t_compat.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/if_loop/t_pr.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/in_cksum/in_cksum.debug	tests-net-debug		debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/net/ipsec/natt_terminator.debug	tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/mcast/mcast.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/mcast/t_mcast.debug		tests-obsolete		debug,atf,rump,obsolete
 ./usr/libdata/debug/usr/tests/net/net/t_pktinfo.debug		tests-net-debug		debug,atf,compattestfile

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.764 src/distrib/sets/lists/tests/mi:1.765
--- src/distrib/sets/lists/tests/mi:1.764	Mon Oct  2 04:16:32 2017
+++ src/distrib/sets/lists/tests/mi	Mon Oct 30 15:59:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.764 2017/10/02 04:16:32 pgoyette Exp $
+# $NetBSD: mi,v 1.765 2017/10/30 15:59:23 ozaki-r Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3319,11 +3319,13 @@
 ./usr/tests/net/ipsectests-net-tests		compattestfile,atf
 ./usr/tests/net/ipsec/Atffile			tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/Kyuafile			tests-net-tests		atf,rump,kyua
+./usr/tests/net/ipsec/natt_terminator		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_ah_keys		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_esp_keys		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_gif		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_l2tp		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_misc		tests-net-tests		atf,rump
+./usr/tests/net/ipsec/t_ipsec_natt		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_sockopt		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_sysctl		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_tcp		tests-net-tests		atf,rump

Index: src/tests/net/net_common.sh
diff -u src/tests/net/net_common.sh:1.22 src/tests/net/net_common.sh:1.23
--- src/tests/net/net_common.sh:1.22	Fri Oct 20 03:45:02 2017
+++ src/tests/net/net_common.sh	Mon Oct 30 15:59:23 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: net_common.sh,v 1.22 2017/10/20 03:45:02 ozaki-r Exp $
+#	$NetBSD: net_common.sh,v 1.23 2017/10/30 15:59:23 ozaki-r Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -183,6 +183,7 @@ BASIC_LIBS="-lrumpnet -lrumpnet_net -lru
 FS_LIBS="$BASIC_LIBS -lrumpvfs -lrumpfs_ffs"
 CRYPTO_LIBS="$BASIC_LIBS -lrumpvfs -lrumpdev_opencrypto \
 -lrumpkern_z -lrumpkern_crypto"
+NPF_LIBS="$BASIC_LIBS -lrumpvfs -lrumpdev_bpf -lrumpnet_bpfjit -lrumpnet_npf"
 
 # We cannot keep variables between test phases, so need to store in files
 _rump_server_socks=./.__socks
@@ -283,6 +284,24 @@ rump_server_crypto_start()
 	return 0
 }
 
+rump_server_npf_start()
+{
+	local sock=$1
+	local _libs=
+	local libs="$NPF_LIBS"
+
+	shift 1
+	_libs="$*"
+
+	for lib in $_libs; do
+		libs="$libs -lrumpnet_$lib"
+	done
+
+	_rump_server_start_common $sock $libs
+
+	return 0
+}
+
 rump_server_add_iface()
 {
 	local sock=$1

Index: src/tests/net/ipsec/Makefile
diff -u src/tests/net/ipsec/Makefile:1.9 src/tests/net/ipsec/Makefile:1.10
--- src/tests/net/ipsec/Makefile:1.9	Wed Aug  2 02:19:56 2017
+++ src/tests/net/ipsec/Makefile	Mon Oct 30 15:59:23 2017
@@ -1,4 +1,4 @@

CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:55:53 UTC 2017

Modified Files:
src/share/man/man9: kernhist.9

Log Message:
Whitespace fix. Give Bl tag table a width. Fix Xr.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/share/man/man9/kernhist.9

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/man9/kernhist.9
diff -u src/share/man/man9/kernhist.9:1.7 src/share/man/man9/kernhist.9:1.8
--- src/share/man/man9/kernhist.9:1.7	Sun Oct 29 09:51:42 2017
+++ src/share/man/man9/kernhist.9	Mon Oct 30 15:55:53 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kernhist.9,v 1.7 2017/10/29 09:51:42 pgoyette Exp $
+.\"	$NetBSD: kernhist.9,v 1.8 2017/10/30 15:55:53 wiz Exp $
 .\"
 .\" Copyright (c) 2015 Matthew R. Green
 .\" All rights reserved.
@@ -64,7 +64,7 @@ extremely early in the kernel initialisa
 It provides a simple restricted
 .Xr printf 3
 format syntax with a maximum of 4 arguments, each of type
-.Vt uintmax_t.
+.Vt uintmax_t .
 .Pp
 .Cd options KERNHIST
 must be present in the kernel configuration to enable these functions and
@@ -177,7 +177,7 @@ Used to dump a well known list of kernel
 The following histories and their respective value (as seen in
 .Pa kernhist.h )
 are available:
-.Bl -tag
+.Bl -tag -width KERNHIST_SCDEBUGHISTXXX
 .It KERNHIST_UVMMAPHIST
 Include events from
 .Dq maphist .
@@ -256,7 +256,7 @@ generalized it into its current form to 
 frameworks.
 .An Paul Goyette Aq Mt pgoye...@netbsd.org
 provided the
-.Xr 9 sysctl
+.Xr sysctl 9
 interface.
 .Sh BUGS
 The restriction against using

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:53:51 UTC 2017

Modified Files:
src/share/man/man4: audio.4

Log Message:
Bump date for previous. Remove superfluous Pp.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/share/man/man4/audio.4

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/audio.4
diff -u src/share/man/man4/audio.4:1.81 src/share/man/man4/audio.4:1.82
--- src/share/man/man4/audio.4:1.81	Fri Oct 27 19:00:07 2017
+++ src/share/man/man4/audio.4	Mon Oct 30 15:53:51 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: audio.4,v 1.81 2017/10/27 19:00:07 nat Exp $
+.\"	$NetBSD: audio.4,v 1.82 2017/10/30 15:53:51 wiz Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd December 11, 2016
+.Dd October 27, 2017
 .Dt AUDIO 4
 .Os
 .Sh NAME
@@ -107,7 +107,6 @@ frequency channels and precision.
 These can be modified to taste by the following
 .Xr sysctl 8
 variables.
-.Pp
 .Bl -tag -width -compact
 .It hw.driverN.precision
 .It hw.driverN.frequency
@@ -246,7 +245,6 @@ whenever a mixer value is changed.
 The following
 .Xr ioctl 2
 commands are supported on the sample devices:
-.Pp
 .Bl -tag -width indent
 .It Dv AUDIO_GETCHAN (int)
 This command will return the audio channel in use.

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:50:48 UTC 2017

Modified Files:
src/share/man/man4: bwfm.4

Log Message:
Remove references to non-existing ifconfig(4). Use Mt.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/bwfm.4

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/bwfm.4
diff -u src/share/man/man4/bwfm.4:1.1 src/share/man/man4/bwfm.4:1.2
--- src/share/man/man4/bwfm.4:1.1	Thu Oct 26 07:29:52 2017
+++ src/share/man/man4/bwfm.4	Mon Oct 30 15:50:48 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: bwfm.4,v 1.1 2017/10/26 07:29:52 maya Exp $
+.\" $NetBSD: bwfm.4,v 1.2 2017/10/30 15:50:48 wiz Exp $
 .\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -38,7 +38,7 @@ The
 driver provides support for Broadcom and Cypress FullMAC network adapters.
 .Sh SEE ALSO
 .Xr bwi 4 ,
-.Xr ifconfig 4 ,
+.\".Xr ifconfig 4 ,
 .Xr ifmedia 4 ,
 .Xr usb 4 ,
 .Xr ifconfig.if 5 ,
@@ -49,7 +49,7 @@ The
 .Nm
 driver was written by
 .An Patrick Wildt
-.Aq patr...@blueri.se
+.Aq Mt patr...@blueri.se .
 .Sh BUGS
 The firmware is outdated and contains known vulnerabilities.
 SDIO and PCI attachments are not supported yet.

CVS commit: src/lib/libc/sys

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:49:24 UTC 2017

Modified Files:
src/lib/libc/sys: sigqueue.2

Log Message:
Remove Tn


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/sys/sigqueue.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/sigqueue.2
diff -u src/lib/libc/sys/sigqueue.2:1.4 src/lib/libc/sys/sigqueue.2:1.5
--- src/lib/libc/sys/sigqueue.2:1.4	Wed Oct 25 17:42:05 2017
+++ src/lib/libc/sys/sigqueue.2	Mon Oct 30 15:49:24 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: sigqueue.2,v 1.4 2017/10/25 17:42:05 abhinav Exp $
+.\" $NetBSD: sigqueue.2,v 1.5 2017/10/30 15:49:24 wiz Exp $
 .\" Copyright (c) 2005 David Xu 
 .\" All rights reserved.
 .\"
@@ -152,7 +152,5 @@ The
 system call conforms to
 .St -p1003.1-2004 .
 .Sh HISTORY
-Support for
-.Tn POSIX
-realtime signal queue first appeared in
+Support for POSIX realtime signal queue first appeared in
 .Nx 6.0 .

CVS commit: src/lib/libc/sys

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:48:38 UTC 2017

Modified Files:
src/lib/libc/sys: chroot.2

Log Message:
Sort errors.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/sys/chroot.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/chroot.2
diff -u src/lib/libc/sys/chroot.2:1.24 src/lib/libc/sys/chroot.2:1.25
--- src/lib/libc/sys/chroot.2:1.24	Wed Oct 25 17:20:52 2017
+++ src/lib/libc/sys/chroot.2	Mon Oct 30 15:48:38 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: chroot.2,v 1.24 2017/10/25 17:20:52 abhinav Exp $
+.\"	$NetBSD: chroot.2,v 1.25 2017/10/30 15:48:38 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -80,8 +80,15 @@ is set to indicate an error.
 .Fn chroot
 will fail and the root directory will be unchanged if:
 .Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path name is not a directory.
+.It Bq Er EACCES
+Search permission is denied for any component of the path name.
+.It Bq Er EFAULT
+.Fa dirname
+points outside the process's allocated address space.
+.It Bq Er EIO
+An I/O error occurred while reading from or writing to the file system.
+.It Bq Er ELOOP
+Too many symbolic links were encountered in translating the pathname.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
 .Brq Dv NAME_MAX
@@ -90,15 +97,8 @@ characters, or an entire path name excee
 characters.
 .It Bq Er ENOENT
 The named directory does not exist.
-.It Bq Er EACCES
-Search permission is denied for any component of the path name.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EFAULT
-.Fa dirname
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
+.It Bq Er ENOTDIR
+A component of the path name is not a directory.
 .It Bq Er EPERM
 The effective user ID of the calling process is not the super-user.
 .El

CVS commit: src/lib/libc/net

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:46:38 UTC 2017

Modified Files:
src/lib/libc/net: ethers.3 resolver.3

Log Message:
Fix Bl argument.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/net/ethers.3
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/net/resolver.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/net/ethers.3
diff -u src/lib/libc/net/ethers.3:1.14 src/lib/libc/net/ethers.3:1.15
--- src/lib/libc/net/ethers.3:1.14	Wed Oct 25 16:13:04 2017
+++ src/lib/libc/net/ethers.3	Mon Oct 30 15:46:38 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ethers.3,v 1.14 2017/10/25 16:13:04 abhinav Exp $
+.\"	$NetBSD: ethers.3,v 1.15 2017/10/30 15:46:38 wiz Exp $
 .\"
 .\" Written by rol...@frob.com.  Public domain.
 .\"
@@ -113,9 +113,7 @@ The
 .Fn ether_hostton ,
 and
 .Fn ether_line
-functions were adopted from
-.Tn SunOS
-and appeared in
+functions were adopted from SunOS and appeared in
 .Nx 1.0 .
 .Sh BUGS
 The data space used by these functions is static; if future use

Index: src/lib/libc/net/resolver.3
diff -u src/lib/libc/net/resolver.3:1.32 src/lib/libc/net/resolver.3:1.33
--- src/lib/libc/net/resolver.3:1.32	Wed Oct 25 16:26:42 2017
+++ src/lib/libc/net/resolver.3	Mon Oct 30 15:46:38 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: resolver.3,v 1.32 2017/10/25 16:26:42 abhinav Exp $
+.\"	$NetBSD: resolver.3,v 1.33 2017/10/30 15:46:38 wiz Exp $
 .\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -590,7 +590,7 @@ and construct an UPDATE message in
 .Fn res_mkupdate
 return the length of the constructed message on no error or one of the
 following error values.
-.Bl -inset -width "-5"
+.Bl -inset -offset "-5"
 .It \-1
 An error occurred parsing
 .Fa rrecp_in .

CVS commit: src/lib/libc/hash/sha2

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:44:29 UTC 2017

Modified Files:
src/lib/libc/hash/sha2: sha2.3

Log Message:
Remove Tn. Do not split on An lines.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/hash/sha2/sha2.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/hash/sha2/sha2.3
diff -u src/lib/libc/hash/sha2/sha2.3:1.7 src/lib/libc/hash/sha2/sha2.3:1.8
--- src/lib/libc/hash/sha2/sha2.3:1.7	Wed Oct 25 16:04:00 2017
+++ src/lib/libc/hash/sha2/sha2.3	Mon Oct 30 15:44:29 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: sha2.3,v 1.7 2017/10/25 16:04:00 abhinav Exp $
+.\" $NetBSD: sha2.3,v 1.8 2017/10/30 15:44:29 wiz Exp $
 .\"	$OpenBSD: sha2.3,v 1.11 2004/06/22 01:57:29 jfb Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Todd C. Miller 
@@ -203,9 +203,8 @@ The
 .Fn SHA256_End
 function is a front end for
 .Fn SHA256_Final
-which converts the digest into an
-.Tn ASCII
-representation of the digest in hexadecimal.
+which converts the digest into an ASCII representation of the digest
+in hexadecimal.
 .Pp
 The
 .Fn SHA256_File
@@ -312,8 +311,9 @@ The SHA2 functions appeared in
 and
 .Nx 3.0 .
 .Sh AUTHORS
+.An -nosplit
 This implementation of the SHA functions was written by
-.An Aaron D. Gifford.
+.An Aaron D. Gifford .
 .Pp
 The
 .Fn SHA256_End ,

CVS commit: src/lib/libc/termios

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:43:21 UTC 2017

Modified Files:
src/lib/libc/termios: tcgetwinsize.3

Log Message:
Remove empty Fd. Use minus for return value. End list. Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/termios/tcgetwinsize.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/termios/tcgetwinsize.3
diff -u src/lib/libc/termios/tcgetwinsize.3:1.1 src/lib/libc/termios/tcgetwinsize.3:1.2
--- src/lib/libc/termios/tcgetwinsize.3:1.1	Wed Oct 25 06:32:59 2017
+++ src/lib/libc/termios/tcgetwinsize.3	Mon Oct 30 15:43:21 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: tcgetwinsize.3,v 1.1 2017/10/25 06:32:59 kre Exp $
+.\" $NetBSD: tcgetwinsize.3,v 1.2 2017/10/30 15:43:21 wiz Exp $
 .\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,10 +35,8 @@
 .Lb libc
 .Sh SYNOPSIS
 .In termios.h
-.Fd
 .Ft int
 .Fn tcgetwinsize "int fd" "struct winsize *gws"
-.Fd
 .Ft int
 .Fn tcsetwinsize "int fd" "const struct winsize *sws"
 .Sh DESCRIPTION
@@ -97,7 +95,7 @@ If an error occurs,
 .Fn tcgetwinsize
 and
 .Fn tcsetwinsize
-return -1 and cause the global variable
+return \-1 and cause the global variable
 .Va errno
 to be set to indicate the error.
 Common errors are as follows:
@@ -143,10 +141,11 @@ or
 .Fn tcsetwinsize
 does not represent a terminal device capable
 of remembering a window size.
+.El
 .Sh SEE ALSO
 .Xr stty 1 ,
-.Xr termios 4 ,
 .Xr pty 4 ,
+.Xr termios 4 ,
 .Xr tty 4 ,
 .Xr signal 7
 .Sh STANDARDS

CVS commit: src/bin/stty

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:38:52 UTC 2017

Modified Files:
src/bin/stty: stty.1

Log Message:
Remove Tn.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/bin/stty/stty.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/stty/stty.1
diff -u src/bin/stty/stty.1:1.44 src/bin/stty/stty.1:1.45
--- src/bin/stty/stty.1:1.44	Wed Oct 25 06:32:59 2017
+++ src/bin/stty/stty.1	Mon Oct 30 15:38:52 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: stty.1,v 1.44 2017/10/25 06:32:59 kre Exp $
+.\"	$NetBSD: stty.1,v 1.45 2017/10/30 15:38:52 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -273,15 +273,10 @@ On the terminal NL performs (does not pe
 Local mode flags (lflags) affect various and sundry characteristics of terminal
 processing.
 Historically the term "local" pertained to new job control features
-implemented by Jim Kulp on a
-.Tn PDP Ns -11/70
-at
-.Tn IIASA .
-Later the driver ran on the first
-.Tn VAX
-at Evans Hall, UC Berkeley, where the job control details
-were greatly modified but the structure definitions and names
-remained essentially unchanged.
+implemented by Jim Kulp on a PDP-11/70 at IIASA.
+Later the driver ran on the first VAX at Evans Hall, UC Berkeley,
+where the job control details were greatly modified but the structure
+definitions and names remained essentially unchanged.
 The second interpretation of the
 .Sq l
 in lflag
@@ -405,22 +400,22 @@ Recognized control characters:
 .It control- Ta "" Ta ""
 .It character	Subscript	Description
 .It _	_	___
-.It eof Ta Tn VEOF Ta EOF No character
-.It eol Ta Tn VEOL Ta EOL No character
-.It eol2 Ta Tn VEOL2 Ta EOL2 No character
-.It erase Ta Tn VERASE Ta ERASE No character
-.It werase Ta Tn VWERASE Ta WERASE No character
-.It kill Ta Tn VKILL Ta KILL No character
-.It reprint Ta Tn VREPRINT Ta REPRINT No character
-.It intr Ta Tn VINTR Ta INTR No character
-.It quit Ta Tn VQUIT Ta QUIT No character
-.It susp Ta Tn VSUSP Ta SUSP No character
-.It dsusp Ta Tn VDSUSP Ta DSUSP No character
-.It start Ta Tn VSTART Ta START No character
-.It stop Ta Tn VSTOP Ta STOP No character
-.It lnext Ta Tn VLNEXT Ta LNEXT No character
-.It status Ta Tn VSTATUS Ta STATUS No character
-.It discard Ta Tn VDISCARD Ta DISCARD No character
+.It eof Ta VEOF Ta EOF No character
+.It eol Ta VEOL Ta EOL No character
+.It eol2 Ta VEOL2 Ta EOL2 No character
+.It erase Ta VERASE Ta ERASE No character
+.It werase Ta VWERASE Ta WERASE No character
+.It kill Ta VKILL Ta KILL No character
+.It reprint Ta VREPRINT Ta REPRINT No character
+.It intr Ta VINTR Ta INTR No character
+.It quit Ta VQUIT Ta QUIT No character
+.It susp Ta VSUSP Ta SUSP No character
+.It dsusp Ta VDSUSP Ta DSUSP No character
+.It start Ta VSTART Ta START No character
+.It stop Ta VSTOP Ta STOP No character
+.It lnext Ta VLNEXT Ta LNEXT No character
+.It status Ta VSTATUS Ta STATUS No character
+.It discard Ta VDISCARD Ta DISCARD No character
 .El
 .Ed
 .It Cm min Ar number

CVS commit: src/bin/sh

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Oct 30 15:37:41 UTC 2017

Modified Files:
src/bin/sh: sh.1

Log Message:
Minor spellchecking changes.


To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/bin/sh/sh.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.171 src/bin/sh/sh.1:1.172
--- src/bin/sh/sh.1:1.171	Sun Oct 29 00:20:42 2017
+++ src/bin/sh/sh.1	Mon Oct 30 15:37:41 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.171 2017/10/29 00:20:42 kre Exp $
+.\"	$NetBSD: sh.1,v 1.172 2017/10/30 15:37:41 wiz Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -640,7 +640,7 @@ is processed to form an 8 bit character 
 If only one or two digits are present, the following
 character must be something other than an octal digit.
 It is safest to always use all 3 digits, with leading
-zeroes if needed.
+zeros if needed.
 If all three digits are present, the first must be one of
 .So 0 Sc Ns \&.. Ns So 3 Sc .
 .Pp
@@ -679,7 +679,7 @@ or
 .Sq \eU .
 The former is followed by from 1 to 4 hex digits, the latter by
 from 1 to 8 hex digits.
-Leading zeroes can be used to pad the sequences to the maximum
+Leading zeros can be used to pad the sequences to the maximum
 permitted length, to avoid any possible ambiguity problem with
 the following character, and because there are some shells that
 insist on exactly 4 (or 8) hex digits.
@@ -733,7 +733,7 @@ an error is generated.
 .Pp
 If any of the preceding escape sequences generate the value
 .Sq \e0
-(a nul character) that character, and all that follow in the
+(a NUL character) that character, and all that follow in the
 same $'...' string, are omitted from the resulting word.
 .Pp
 After the $'...' string has had any included escape sequences
@@ -2152,7 +2152,7 @@ Later attempts to export the variable wi
 Note this does not prevent explicitly exporting a variable
 to a single command, script or function by preceding that
 command invocation by a variable assignment to that variable,
-provided the variable is not also readonly.
+provided the variable is not also read-only.
 That is
 .Dl	export -x FOO ; # FOO will now not be exported by default
 .Dl	FOO=some_value my_command
@@ -2182,9 +2182,9 @@ been marked as unavailable for export,
 in which cases it exits with status 1.
 .Pp
 Note that there is no restriction upon exporting,
-or un-exporting, readonly variables.
+or un-exporting, read-only variables.
 The no-export flag can be reset by unsetting the variable
-and creating it again \(en provided it is not also readonly.
+and creating it again \(en provided it is not also read-only.
 .It fc Oo Fl e Ar editor Oc Oo Ar first Oo Ar last Oc Oc
 .It fc Fl l Oo Fl nr Oc Oo Ar first Oo Ar last Oc Oc
 .It fc Fl s Oo Ar old=new Oc Oo Ar first Oc
@@ -2851,7 +2851,7 @@ Each line contains two accumulated time 
 in minutes and seconds (including fractions of a second.)
 The first value gives the user time consumed, the second the system time.
 .Pp
-The first output line gives the cpu and system times consumed by the
+The first output line gives the CPU and system times consumed by the
 shell itself.
 The second line gives the accumulated times for children of this
 shell (and their descendants) which have exited, and then been
@@ -3524,7 +3524,7 @@ and
 .Fl V
 options of the
 .Ic set
-builtin command, described in
+built-in command, described in
 .Sx Built-ins
 above, which are documented further above in
 .Sx Argument List Processing . )

CVS commit: src/sys/net

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Mon Oct 30 11:24:04 UTC 2017

Modified Files:
src/sys/net: if_l2tp.c if_l2tp.h

Log Message:
If if_attach() failed in the attach function, return. Add comments about 
if_initialize().

suggested by ozaki-r@n.o.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.2 -r1.3 src/sys/net/if_l2tp.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/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.12 src/sys/net/if_l2tp.c:1.13
--- src/sys/net/if_l2tp.c:1.12	Thu Oct 19 11:28:30 2017
+++ src/sys/net/if_l2tp.c	Mon Oct 30 11:24:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_l2tp.c,v 1.12 2017/10/19 11:28:30 knakahara Exp $	*/
+/*	$NetBSD: if_l2tp.c,v 1.13 2017/10/30 11:24:04 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.12 2017/10/19 11:28:30 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.13 2017/10/30 11:24:04 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -227,10 +227,17 @@ l2tp_clone_create(struct if_clone *ifc, 
 {
 	struct l2tp_softc *sc;
 	struct l2tp_variant *var;
+	int rv;
 
 	sc = kmem_zalloc(sizeof(struct l2tp_softc), KM_SLEEP);
-	var = kmem_zalloc(sizeof(struct l2tp_variant), KM_SLEEP);
+	if_initname(>l2tp_ec.ec_if, ifc->ifc_name, unit);
+	rv = l2tpattach0(sc);
+	if (rv != 0) {
+		kmem_free(sc, sizeof(struct l2tp_softc));
+		return rv;
+	}
 
+	var = kmem_zalloc(sizeof(struct l2tp_variant), KM_SLEEP);
 	var->lv_softc = sc;
 	var->lv_state = L2TP_STATE_DOWN;
 	var->lv_use_cookie = L2TP_COOKIE_OFF;
@@ -240,10 +247,6 @@ l2tp_clone_create(struct if_clone *ifc, 
 	mutex_init(>l2tp_lock, MUTEX_DEFAULT, IPL_NONE);
 	PSLIST_ENTRY_INIT(sc, l2tp_hash);
 
-	if_initname(>l2tp_ec.ec_if, ifc->ifc_name, unit);
-
-	l2tpattach0(sc);
-
 	sc->l2tp_ro_percpu = percpu_alloc(sizeof(struct l2tp_ro));
 	percpu_foreach(sc->l2tp_ro_percpu, l2tp_ro_init_pc, NULL);
 
@@ -254,9 +257,10 @@ l2tp_clone_create(struct if_clone *ifc, 
 	return (0);
 }
 
-void
+int
 l2tpattach0(struct l2tp_softc *sc)
 {
+	int rv;
 
 	sc->l2tp_ec.ec_if.if_addrlen = 0;
 	sc->l2tp_ec.ec_if.if_mtu= L2TP_MTU;
@@ -270,9 +274,19 @@ l2tpattach0(struct l2tp_softc *sc)
 	sc->l2tp_ec.ec_if.if_transmit = l2tp_transmit;
 	sc->l2tp_ec.ec_if._if_input = ether_input;
 	IFQ_SET_READY(>l2tp_ec.ec_if.if_snd);
-	if_attach(>l2tp_ec.ec_if);
+	/* XXX
+	 * It may improve performance to use if_initialize()/if_register()
+	 * so that l2tp_input() calls if_input() instead of
+	 * if_percpuq_enqueue(). However, that causes recursive softnet_lock
+	 * when NET_MPSAFE is not set.
+	 */
+	rv = if_attach(>l2tp_ec.ec_if);
+	if (rv != 0)
+		return rv;
 	if_alloc_sadl(>l2tp_ec.ec_if);
 	bpf_attach(>l2tp_ec.ec_if, DLT_EN10MB, sizeof(struct ether_header));
+
+	return 0;
 }
 
 void

Index: src/sys/net/if_l2tp.h
diff -u src/sys/net/if_l2tp.h:1.2 src/sys/net/if_l2tp.h:1.3
--- src/sys/net/if_l2tp.h:1.2	Wed May 31 08:19:44 2017
+++ src/sys/net/if_l2tp.h	Mon Oct 30 11:24:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_l2tp.h,v 1.2 2017/05/31 08:19:44 knakahara Exp $	*/
+/*	$NetBSD: if_l2tp.h,v 1.3 2017/10/30 11:24:04 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -162,7 +162,7 @@ l2tp_heldref_variant(struct l2tp_variant
 
 /* Prototypes */
 void l2tpattach(int);
-void l2tpattach0(struct l2tp_softc *);
+int l2tpattach0(struct l2tp_softc *);
 void l2tp_input(struct mbuf *, struct ifnet *);
 int l2tp_ioctl(struct ifnet *, u_long, void *);
 

CVS commit: [netbsd-8] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Oct 30 09:35:51 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
330


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.71 -r1.1.2.72 src/doc/CHANGES-8.0

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-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.71 src/doc/CHANGES-8.0:1.1.2.72
--- src/doc/CHANGES-8.0:1.1.2.71	Wed Oct 25 07:19:29 2017
+++ src/doc/CHANGES-8.0	Mon Oct 30 09:35:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.71 2017/10/25 07:19:29 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.72 2017/10/30 09:35:51 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -6492,3 +6492,34 @@ sys/net/bpf.c	1.217
 	Turn on D_MPSAFE flag of bpf_cdevsw that is already MP-safe
 	[ozaki-r, ticket #329]
 
+sbin/fsck_lfs/inode.c1.69
+sbin/fsck_lfs/lfs.c1.73
+sbin/fsck_lfs/pass6.c1.50
+sbin/fsck_lfs/segwrite.c			1.46
+sys/ufs/lfs/lfs.h1.202-1.203
+sys/ufs/lfs/lfs_accessors.h			1.48
+sys/ufs/lfs/lfs_alloc.c1.136-1.137
+sys/ufs/lfs/lfs_balloc.c			1.94
+sys/ufs/lfs/lfs_bio.c1.141
+sys/ufs/lfs/lfs_extern.h			1.113
+sys/ufs/lfs/lfs_inode.c1.156-1.157
+sys/ufs/lfs/lfs_inode.h1.20, 1.21, 1.23
+sys/ufs/lfs/lfs_itimes.c			1.20
+sys/ufs/lfs/lfs_pages.c1.13-1.15
+sys/ufs/lfs/lfs_rename.c			1.22
+sys/ufs/lfs/lfs_segment.c			1.270-1.275
+sys/ufs/lfs/lfs_subr.c1.94-1.97
+sys/ufs/lfs/lfs_syscalls.c			1.175
+sys/ufs/lfs/lfs_vfsops.c			1.360
+sys/ufs/lfs/lfs_vnops.c1.316-1.321
+sys/ufs/lfs/ulfs_inode.c			1.20
+sys/ufs/lfs/ulfs_inode.h			1.24
+sys/ufs/lfs/ulfs_lookup.c			1.41
+sys/ufs/lfs/ulfs_quota2.c			1.31
+sys/ufs/lfs/ulfs_readwrite.c			1.24
+sys/ufs/lfs/ulfs_vnops.c			1.49-1.50
+
+	Code cleanup and bugfixes.  Fix buffer overflow/KASSERT when
+	cookies are supplied.
+	[maya, ticket #330]
+

CVS commit: [netbsd-8] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Oct 30 09:29:04 UTC 2017

Modified Files:
src/sbin/fsck_lfs [netbsd-8]: inode.c lfs.c pass6.c segwrite.c
src/sys/ufs/lfs [netbsd-8]: lfs.h lfs_accessors.h lfs_alloc.c
lfs_balloc.c lfs_bio.c lfs_extern.h lfs_inode.c lfs_inode.h
lfs_itimes.c lfs_pages.c lfs_rename.c lfs_segment.c lfs_subr.c
lfs_syscalls.c lfs_vfsops.c lfs_vnops.c ulfs_inode.c ulfs_inode.h
ulfs_lookup.c ulfs_quota2.c ulfs_readwrite.c ulfs_vnops.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #330):
sbin/fsck_lfs/inode.c: 1.69
sbin/fsck_lfs/lfs.c: 1.73
sbin/fsck_lfs/pass6.c: 1.50
sbin/fsck_lfs/segwrite.c: 1.46
sys/ufs/lfs/lfs.h: 1.202-1.203
sys/ufs/lfs/lfs_accessors.h: 1.48
sys/ufs/lfs/lfs_alloc.c: 1.136-1.137
sys/ufs/lfs/lfs_balloc.c: 1.94
sys/ufs/lfs/lfs_bio.c: 1.141
sys/ufs/lfs/lfs_extern.h: 1.113
sys/ufs/lfs/lfs_inode.c: 1.156-1.157
sys/ufs/lfs/lfs_inode.h: 1.20, 1.21, 1.23
sys/ufs/lfs/lfs_itimes.c: 1.20
sys/ufs/lfs/lfs_pages.c: 1.13-1.15
sys/ufs/lfs/lfs_rename.c: 1.22
sys/ufs/lfs/lfs_segment.c: 1.270-1.275
sys/ufs/lfs/lfs_subr.c: 1.94-1.97
sys/ufs/lfs/lfs_syscalls.c: 1.175
sys/ufs/lfs/lfs_vfsops.c: 1.360
sys/ufs/lfs/lfs_vnops.c: 1.316-1.321
sys/ufs/lfs/ulfs_inode.c: 1.20
sys/ufs/lfs/ulfs_inode.h: 1.24
sys/ufs/lfs/ulfs_lookup.c: 1.41
sys/ufs/lfs/ulfs_quota2.c: 1.31
sys/ufs/lfs/ulfs_readwrite.c: 1.24
sys/ufs/lfs/ulfs_vnops.c: 1.49-1.50
Update inode member i_flag --> i_state to keep up with kernel changes
Move definition of IN_ALLMOD near the flag it's a mask for.
Now we can see that it doesn't match all the flags, but changing that will
require more careful thought.
Correct confusion between i_flag and i_flags
These will have to be renamed.
Spotted by Riastradh, thanks!
Add an XXX about the missing flags so it's not buried in a commit
message.
now the XXX count for LFS is 260
Rename i_flag to i_state.
The similarity to i_flags has previously caused errors.
Use continue to denote the no-op loop to match netbsd style
newline for extra clarity.
It isn't safe to drain dirops with seglock held, it'll deadlock if there
are any dirops. drain before grabbing seglock.
lfs_dirops == 0 is always true (as we already drained dirops), so omit
that part of the comparison.
Fixes a lot of LFS deadlocks. PR kern/52301
Many thanks to dholland for help analyzing coredumps
Ifdef out KDASSERT which fires on my machine.
Deduplicate sanity check that seglock is held on segunlock
Revert r1.272 fix to PR kern/52301, the performance hit is making things
unusable.
change lfs_nextsegsleep and lfs_allclean_wakeup to use condvar
XXX had to use lfs_lock in lfs_segwait, removed kernel_lock, is this
appropriate?
fix buffer overflow/KASSERT when cookies are supplied
lfs no longer uses the ffs-style struct direct, use the correct minimum
size
from dholland
XXX more wrong
Consistently use {,UN}MARK_VNODE macros rather than function calls.
Not much point doing anything after a panic call
Ask some question about the code in a XXX comment
XXX question our double-flushing of dirops
Fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.68.8.1 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.72 -r1.72.6.1 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.49 -r1.49.8.1 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.45 -r1.45.8.1 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.201 -r1.201.6.1 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/ufs/lfs/lfs_accessors.h
cvs rdiff -u -r1.135 -r1.135.6.1 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.92 -r1.92.6.1 src/sys/ufs/lfs/lfs_balloc.c \
src/sys/ufs/lfs/lfs_subr.c
cvs rdiff -u -r1.139 -r1.139.4.1 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.111 -r1.111.10.1 src/sys/ufs/lfs/lfs_extern.h
cvs rdiff -u -r1.155 -r1.155.6.1 src/sys/ufs/lfs/lfs_inode.c
cvs rdiff -u -r1.19 -r1.19.6.1 src/sys/ufs/lfs/lfs_inode.h
cvs rdiff -u -r1.19 -r1.19.10.1 src/sys/ufs/lfs/lfs_itimes.c
cvs rdiff -u -r1.11.6.1 -r1.11.6.2 src/sys/ufs/lfs/lfs_pages.c
cvs rdiff -u -r1.21 -r1.21.10.1 src/sys/ufs/lfs/lfs_rename.c
cvs rdiff -u -r1.269 -r1.269.6.1 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.174 -r1.174.4.1 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.359 -r1.359.4.1 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.315 -r1.315.2.1 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.22 -r1.22.10.1 src/sys/ufs/lfs/ulfs_inode.h
cvs rdiff -u -r1.40 -r1.40.6.1 src/sys/ufs/lfs/ulfs_lookup.c
cvs rdiff -u -r1.30 -r1.30.6.1 src/sys/ufs/lfs/ulfs_quota2.c
cvs rdiff -u -r1.23 -r1.23.6.1 src/sys/ufs/lfs/ulfs_readwrite.c
cvs rdiff -u -r1.48 -r1.48.4.1 src/sys/ufs/lfs/ulfs_vnops.c

Please note that diffs are not public domain; they are subject to the