CVS commit: [prg-localcount2] src/sys/net

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 03:46:57 UTC 2017

Modified Files:
src/sys/net [prg-localcount2]: if_tun.c

Log Message:
Add a localcount to the devsw so it can be loaded as a rump module


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.138.4.1 src/sys/net/if_tun.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_tun.c
diff -u src/sys/net/if_tun.c:1.138 src/sys/net/if_tun.c:1.138.4.1
--- src/sys/net/if_tun.c:1.138	Sun Jan 29 18:30:33 2017
+++ src/sys/net/if_tun.c	Fri Apr 28 03:46:57 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tun.c,v 1.138 2017/01/29 18:30:33 maya Exp $	*/
+/*	$NetBSD: if_tun.c,v 1.138.4.1 2017/04/28 03:46:57 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1988, Julian Onions 
@@ -19,7 +19,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.138 2017/01/29 18:30:33 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.138.4.1 2017/04/28 03:46:57 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -98,6 +99,7 @@ static dev_type_poll(tunpoll);
 static dev_type_kqfilter(tunkqfilter);
 
 const struct cdevsw tun_cdevsw = {
+	DEVSW_MODULE_INIT
 	.d_open = tunopen,
 	.d_close = tunclose,
 	.d_read = tunread,

CVS commit: [prg-localcount2] src/sys/net

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 03:46:57 UTC 2017

Modified Files:
src/sys/net [prg-localcount2]: if_tun.c

Log Message:
Add a localcount to the devsw so it can be loaded as a rump module


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.138.4.1 src/sys/net/if_tun.c

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

CVS commit: [prg-localcount2] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 03:41:26 UTC 2017

Modified Files:
src/sys/kern [prg-localcount2]: subr_devsw.c

Log Message:
Use printf() instead of aprintf_normal(), fix the sense of a comparison


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.2 -r1.37.2.3 src/sys/kern/subr_devsw.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/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.37.2.2 src/sys/kern/subr_devsw.c:1.37.2.3
--- src/sys/kern/subr_devsw.c:1.37.2.2	Fri Apr 28 02:36:10 2017
+++ src/sys/kern/subr_devsw.c	Fri Apr 28 03:41:26 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_devsw.c,v 1.37.2.2 2017/04/28 02:36:10 pgoyette Exp $	*/
+/*	$NetBSD: subr_devsw.c,v 1.37.2.3 2017/04/28 03:41:26 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.37.2.2 2017/04/28 02:36:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.37.2.3 2017/04/28 03:41:26 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dtrace.h"
@@ -151,19 +151,18 @@ devsw_attach(const char *devname,
 
 	if (bdev != NULL) {
 		if (bdev->d_localcount == NULL) {
-			aprint_normal("%s: %s's bdevsw has no localcount",
+			printf("%s: %s's bdevsw has no localcount",
 			__func__, devname);
 			return EINVAL;
 		}
 		if (bdev->d_localcount == cdev->d_localcount) {
-			aprint_normal("%s: %s uses same localcount for both "
-			cdevsw and bdevsw", __func__, devname);
+			printf("%s: %s uses same localcount for both "
+			"cdevsw and bdevsw", __func__, devname);
 			return EINVAL;
 		}
 	}
-	if (cdev != NULL) {
-		aprint_normal("%s: %s's cdevsw has no localcount",
-		__func__, devname);
+	if (cdev == NULL) {
+		printf("%s: %s's cdevsw has no localcount", __func__, devname);
 		return EINVAL;
 	}
 
@@ -308,8 +307,7 @@ bdevsw_attach(const struct bdevsw *devsw
 		return (EEXIST);
 
 	if (devsw->d_localcount == NULL) {
-		aprint_normal("%s: %s's bdevsw has no localcount",
-		__func__, devname);
+		printf("%s: bdevsw has no localcount", __func__);
 		return EINVAL;
 	}
 	localcount_init(devsw->d_localcount);
@@ -365,8 +363,7 @@ cdevsw_attach(const struct cdevsw *devsw
 		return (EEXIST);
 
 	if (devsw->d_localcount == NULL) {
-		aprint_normal("%s: %s's cdevsw has no localcount",
-		__func__, devname);
+		printf("%s: cdevsw has no localcount", __func__);
 		return EINVAL;
 	}
 	localcount_init(devsw->d_localcount);

CVS commit: [prg-localcount2] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 03:41:26 UTC 2017

Modified Files:
src/sys/kern [prg-localcount2]: subr_devsw.c

Log Message:
Use printf() instead of aprintf_normal(), fix the sense of a comparison


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.2 -r1.37.2.3 src/sys/kern/subr_devsw.c

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

CVS commit: [prg-localcount2] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 02:36:10 UTC 2017

Modified Files:
src/sys/kern [prg-localcount2]: subr_devsw.c

Log Message:
No need to panic if a modular driver doesn't include the required
localcount members in the {b,c}devsw.  Just log a console message
and return EINVAL to signal failure.


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/kern/subr_devsw.c

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

CVS commit: [prg-localcount2] src/sys/kern

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 02:36:10 UTC 2017

Modified Files:
src/sys/kern [prg-localcount2]: subr_devsw.c

Log Message:
No need to panic if a modular driver doesn't include the required
localcount members in the {b,c}devsw.  Just log a console message
and return EINVAL to signal failure.


To generate a diff of this commit:
cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/kern/subr_devsw.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/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.37.2.1 src/sys/kern/subr_devsw.c:1.37.2.2
--- src/sys/kern/subr_devsw.c:1.37.2.1	Thu Apr 27 05:36:37 2017
+++ src/sys/kern/subr_devsw.c	Fri Apr 28 02:36:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_devsw.c,v 1.37.2.1 2017/04/27 05:36:37 pgoyette Exp $	*/
+/*	$NetBSD: subr_devsw.c,v 1.37.2.2 2017/04/28 02:36:10 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.37.2.1 2017/04/27 05:36:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.37.2.2 2017/04/28 02:36:10 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dtrace.h"
@@ -150,15 +150,22 @@ devsw_attach(const char *devname,
 	mutex_enter(_lock);
 
 	if (bdev != NULL) {
-		KASSERTMSG(bdev->d_localcount != NULL,
-		"%s: bdev %s has no d_localcount", __func__, devname);
-		KASSERTMSG(bdev->d_localcount != cdev->d_localcount,
-		"%s: bdev and cdev for %s have same d_localcount",
+		if (bdev->d_localcount == NULL) {
+			aprint_normal("%s: %s's bdevsw has no localcount",
+			__func__, devname);
+			return EINVAL;
+		}
+		if (bdev->d_localcount == cdev->d_localcount) {
+			aprint_normal("%s: %s uses same localcount for both "
+			cdevsw and bdevsw", __func__, devname);
+			return EINVAL;
+		}
+	}
+	if (cdev != NULL) {
+		aprint_normal("%s: %s's cdevsw has no localcount",
 		__func__, devname);
+		return EINVAL;
 	}
-	if (cdev != NULL)
-		KASSERTMSG(cdev->d_localcount != NULL,
-		"%s: cdev %s has no d_localcount", __func__, devname);
 
 	for (i = 0 ; i < max_devsw_convs ; i++) {
 		conv = _conv[i];
@@ -300,8 +307,11 @@ bdevsw_attach(const struct bdevsw *devsw
 	if (bdevsw[*devmajor] != NULL)
 		return (EEXIST);
 
-	KASSERTMSG(devsw->d_localcount != NULL, "%s: bdev for major %d has "
-	"no localcount", __func__, *devmajor);
+	if (devsw->d_localcount == NULL) {
+		aprint_normal("%s: %s's bdevsw has no localcount",
+		__func__, devname);
+		return EINVAL;
+	}
 	localcount_init(devsw->d_localcount);
 
 	/* ensure visibility of the bdevsw */
@@ -354,8 +364,11 @@ cdevsw_attach(const struct cdevsw *devsw
 	if (cdevsw[*devmajor] != NULL)
 		return (EEXIST);
 
-	KASSERTMSG(devsw->d_localcount != NULL, "%s: cdev for major %d has "
-	"no localcount", __func__, *devmajor);
+	if (devsw->d_localcount == NULL) {
+		aprint_normal("%s: %s's cdevsw has no localcount",
+		__func__, devname);
+		return EINVAL;
+	}
 	localcount_init(devsw->d_localcount);
 
 	/* ensure visibility of the cdevsw */

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Apr 28 02:29:38 UTC 2017

Modified Files:
src/sys/netipsec: ipsec.c

Log Message:
Fix function name in log message


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/netipsec/ipsec.c

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

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Apr 28 02:29:38 UTC 2017

Modified Files:
src/sys/netipsec: ipsec.c

Log Message:
Fix function name in log message


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/netipsec/ipsec.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.84 src/sys/netipsec/ipsec.c:1.85
--- src/sys/netipsec/ipsec.c:1.84	Tue Apr 25 05:44:11 2017
+++ src/sys/netipsec/ipsec.c	Fri Apr 28 02:29:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec.c,v 1.84 2017/04/25 05:44:11 ozaki-r Exp $	*/
+/*	$NetBSD: ipsec.c,v 1.85 2017/04/28 02:29:38 ozaki-r Exp $	*/
 /*	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.84 2017/04/25 05:44:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.85 2017/04/28 02:29:38 ozaki-r Exp $");
 
 /*
  * IPsec controller part.
@@ -2379,8 +2379,7 @@ ipsec6_input(struct mbuf *m)
 	} else {
 		/* XXX error stat??? */
 		error = EINVAL;
-		DPRINTF(("ip6_input: no SP, packet"
-		" discarded\n"));/*XXX*/
+		DPRINTF(("%s: no SP, packet discarded\n", __func__));/*XXX*/
 	}
 	splx(s);
 

CVS commit: [prg-localcount2] src/sys/net/npf

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 02:13:19 UTC 2017

Modified Files:
src/sys/net/npf [prg-localcount2]: npf_os.c

Log Message:
The npf device may be loaded as a (rump) module, so make sure we have a
localcount in its devsw


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/net/npf/npf_os.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_os.c
diff -u src/sys/net/npf/npf_os.c:1.6 src/sys/net/npf/npf_os.c:1.6.6.1
--- src/sys/net/npf/npf_os.c:1.6	Fri Jan 27 17:25:34 2017
+++ src/sys/net/npf/npf_os.c	Fri Apr 28 02:13:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_os.c,v 1.6 2017/01/27 17:25:34 ryo Exp $	*/
+/*	$NetBSD: npf_os.c,v 1.6.6.1 2017/04/28 02:13:19 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #ifdef _KERNEL
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.6 2017/01/27 17:25:34 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.6.6.1 2017/04/28 02:13:19 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pf.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -92,6 +93,7 @@ static int	npf_dev_poll(dev_t, int, lwp_
 static int	npf_dev_read(dev_t, struct uio *, int);
 
 const struct cdevsw npf_cdevsw = {
+	DEVSW_MODULE_INIT
 	.d_open = npf_dev_open,
 	.d_close = npf_dev_close,
 	.d_read = npf_dev_read,

CVS commit: [prg-localcount2] src/sys/net/npf

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 02:13:19 UTC 2017

Modified Files:
src/sys/net/npf [prg-localcount2]: npf_os.c

Log Message:
The npf device may be loaded as a (rump) module, so make sure we have a
localcount in its devsw


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/net/npf/npf_os.c

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

CVS commit: [prg-localcount2] src/external/cddl/osnet/dist/uts/common/fs/zfs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 01:49:38 UTC 2017

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [prg-localcount2]:
zfs_ioctl.c

Log Message:
The zfs control device is loaded as a module under rump-server, so
add the localcount stuff to its {b,c}devsw

XXX How to feed this back to upstream?


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c

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

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10.6.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10	Fri Apr 10 20:55:38 2015
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c	Fri Apr 28 01:49:38 2017
@@ -67,6 +67,10 @@
 #include 
 #include 
 
+#ifdef __NetBSD__
+#include 
+#endif
+
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"
 #include "zfs_deleg.h"
@@ -4563,6 +4567,7 @@ nb_zfsdev_ioctl(dev_t dev, u_long cmd, v
 }
 
 const struct bdevsw zfs_bdevsw = {
+	DEVSW_MODULE_INIT
 	.d_open = nb_zvol_bopen,
 	.d_close = nb_zvol_bclose,
 	.d_strategy = zvol_strategy,
@@ -4573,6 +4578,7 @@ const struct bdevsw zfs_bdevsw = {
 };
 
 const struct cdevsw zfs_cdevsw = {
+	DEVSW_MODULE_INIT
 	.d_open = nb_zvol_copen,
 	.d_close = nb_zvol_cclose,
 	.d_read = nb_zvol_read,

CVS commit: [prg-localcount2] src/external/cddl/osnet/dist/uts/common/fs/zfs

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 28 01:49:38 UTC 2017

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [prg-localcount2]:
zfs_ioctl.c

Log Message:
The zfs control device is loaded as a module under rump-server, so
add the localcount stuff to its {b,c}devsw

XXX How to feed this back to upstream?


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c

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

CVS commit: src/sys/arch/x86/include

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Fri Apr 28 01:23:58 UTC 2017

Modified Files:
src/sys/arch/x86/include: i82489reg.h

Log Message:
Added AMD extended APIC register space present definition.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/include/i82489reg.h

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

CVS commit: src/sys/arch/x86/include

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Fri Apr 28 01:23:58 UTC 2017

Modified Files:
src/sys/arch/x86/include: i82489reg.h

Log Message:
Added AMD extended APIC register space present definition.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/include/i82489reg.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/i82489reg.h
diff -u src/sys/arch/x86/include/i82489reg.h:1.15 src/sys/arch/x86/include/i82489reg.h:1.16
--- src/sys/arch/x86/include/i82489reg.h:1.15	Sat Apr 22 04:24:25 2017
+++ src/sys/arch/x86/include/i82489reg.h	Fri Apr 28 01:23:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: i82489reg.h,v 1.15 2017/04/22 04:24:25 nonaka Exp $	*/
+/*	$NetBSD: i82489reg.h,v 1.16 2017/04/28 01:23:58 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@
 #	define LAPIC_VERSION_LVT_MASK	0x00ff
 #	define LAPIC_VERSION_LVT_SHIFT	16
 #	define LAPIC_VERSION_DIRECTED_EOI 0x0100
+#	define LAPIC_VERSION_EXTAPIC_SPACE 0x8000
 
 #define LAPIC_TPRI		0x080	/* Task Prio. RW */
 #	define LAPIC_TPRI_MASK		0x00ff

CVS commit: [prg-localcount2] src/sys/dev

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 27 23:18:21 UTC 2017

Modified Files:
src/sys/dev [prg-localcount2]: md.c

Log Message:
Don't reference a known-NULL pointer, and remove duplicated calls to
mutex_enter() and mutex_exit()


To generate a diff of this commit:
cvs rdiff -u -r1.78.6.1 -r1.78.6.2 src/sys/dev/md.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/md.c
diff -u src/sys/dev/md.c:1.78.6.1 src/sys/dev/md.c:1.78.6.2
--- src/sys/dev/md.c:1.78.6.1	Thu Apr 27 05:36:35 2017
+++ src/sys/dev/md.c	Thu Apr 27 23:18:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.78.6.1 2017/04/27 05:36:35 pgoyette Exp $	*/
+/*	$NetBSD: md.c,v 1.78.6.2 2017/04/27 23:18:21 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.78.6.1 2017/04/27 05:36:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.78.6.2 2017/04/27 23:18:21 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_md.h"
@@ -294,7 +294,7 @@ mdopen(dev_t dev, int flag, int fmt, str
 		sc = device_private(self);
 		if (sc == NULL) {
 			mutex_exit(_device_lock);
-			device_release(sc->sc_dev);
+			device_release(self);
 			return ENOMEM;
 		}
 	}
@@ -450,7 +450,6 @@ mdstrategy(struct buf *bp)
 		bp->b_error = ENXIO;
 		goto done;
 	}
-	mutex_enter(>sc_lock);
 
 	mutex_enter(>sc_lock);
 
@@ -499,8 +498,6 @@ mdstrategy(struct buf *bp)
 	}
 	mutex_exit(>sc_lock);
 
-	mutex_exit(>sc_lock);
-
  done:
 	biodone(bp);
 	if (sc != NULL)

CVS commit: [prg-localcount2] src/sys/dev

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 27 23:18:21 UTC 2017

Modified Files:
src/sys/dev [prg-localcount2]: md.c

Log Message:
Don't reference a known-NULL pointer, and remove duplicated calls to
mutex_enter() and mutex_exit()


To generate a diff of this commit:
cvs rdiff -u -r1.78.6.1 -r1.78.6.2 src/sys/dev/md.c

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

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Apr 27 23:17:21 UTC 2017

Modified Files:
src/sys/arch/sparc64/dev: ffb.c

Log Message:
- don't blindly copy attribute bits which we don't support or which make no
  sense in the attribute buffer
- support WSATTR_UNDERLINE
- remove unused function


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc64/dev/ffb.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/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.59 src/sys/arch/sparc64/dev/ffb.c:1.60
--- src/sys/arch/sparc64/dev/ffb.c:1.59	Sat Apr 22 15:07:49 2017
+++ src/sys/arch/sparc64/dev/ffb.c	Thu Apr 27 23:17:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb.c,v 1.59 2017/04/22 15:07:49 macallan Exp $	*/
+/*	$NetBSD: ffb.c,v 1.60 2017/04/27 23:17:21 macallan Exp $	*/
 /*	$OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.59 2017/04/22 15:07:49 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.60 2017/04/27 23:17:21 macallan Exp $");
 
 #include 
 #include 
@@ -125,7 +125,6 @@ void	ffb_ras_init(struct ffb_softc *);
 void	ffb_ras_copyrows(void *, int, int, int);
 void	ffb_ras_erasecols(void *, int, int, int, long int);
 void	ffb_ras_eraserows(void *, int, int, long int);
-void	ffb_ras_do_cursor(struct rasops_info *);
 void	ffb_ras_fill(struct ffb_softc *);
 void	ffb_ras_invert(struct ffb_softc *);
 static void	ffb_ras_setfg(struct ffb_softc *, int32_t);
@@ -1087,20 +1086,44 @@ ffb_putchar_mono(void *cookie, int row, 
 		case 1: {
 			uint8_t *data8 = data;
 			uint32_t reg;
-			for (i = 0; i < he; i++) {
+			if (attr & WSATTR_UNDERLINE) {
+for (i = 0; i < he - 2; i++) {
+	reg = *data8;
+	FBC_WRITE(sc, FFB_FBC_FONT, reg << 24);
+	data8++;
+}
+FBC_WRITE(sc, FFB_FBC_FONT, 0xff00);
+data8++;
 reg = *data8;
 FBC_WRITE(sc, FFB_FBC_FONT, reg << 24);
-data8++;
+			} else {
+for (i = 0; i < he; i++) {
+	reg = *data8;
+	FBC_WRITE(sc, FFB_FBC_FONT, reg << 24);
+	data8++;
+}
 			}
 			break;
 		}
 		case 2: {
 			uint16_t *data16 = data;
 			uint32_t reg;
-			for (i = 0; i < he; i++) {
+			if (attr & WSATTR_UNDERLINE) {
+for (i = 0; i < he - 2; i++) {
+	reg = *data16;
+	FBC_WRITE(sc, FFB_FBC_FONT, reg << 16);
+	data16++;
+}
+FBC_WRITE(sc, FFB_FBC_FONT, 0x);
+data16++;
 reg = *data16;
 FBC_WRITE(sc, FFB_FBC_FONT, reg << 16);
-data16++;
+			} else {
+for (i = 0; i < he; i++) {
+	reg = *data16;
+	FBC_WRITE(sc, FFB_FBC_FONT, reg << 16);
+	data16++;
+}
 			}
 			break;
 		}
@@ -1149,7 +1172,7 @@ ffb_putchar_aa(void *cookie, int row, in
 	FBC_WRITE(sc, FFB_FBC_BW, wi);
 
 	/* if we draw a space we're done */
-	if (c == ' ') return;
+	if (c == ' ') goto out;
 
 	/* now enable alpha blending */
 	ffb_ras_setfg(sc, fg);
@@ -1186,7 +1209,16 @@ ffb_putchar_aa(void *cookie, int row, in
 			ddest++;
 		}
 		dest += 2048;
-	} 
+	}
+out:
+	/* check if we need to draw an underline */
+	if (attr & WSATTR_UNDERLINE) {
+		dest =  sc->sc_sfb32 + ((y + he - 2) << 11) + x;
+		for (i = 0; i < wi; i++) {
+			*dest = 0xa000;
+			dest++;
+		}
+	}
 }
 
 int
@@ -1198,11 +1230,11 @@ ffb_allocattr(void *cookie, int fg, int 
 		bg = WS_DEFAULT_BG;
 	}
 	if (flags & WSATTR_REVERSE) {
-		*attrp = (bg & 0xff) << 24 | (fg & 0xff) << 16 | 
-		(flags & 0xff);
+		*attrp = (bg & 0xff) << 24 | (fg & 0xff) << 16;
 	} else
-		*attrp = (fg & 0xff) << 24 | (bg & 0xff) << 16 | 
-		(flags & 0xff);
+		*attrp = (fg & 0xff) << 24 | (bg & 0xff) << 16;
+	if (flags & WSATTR_UNDERLINE)
+		*attrp |= WSATTR_UNDERLINE;
 	return 0;
 }
 
@@ -1217,8 +1249,7 @@ ffb_init_screen(void *cookie, struct vco
 	ri->ri_width = sc->sc_width;
 	ri->ri_height = sc->sc_height;
 	ri->ri_stride = sc->sc_linebytes;
-	ri->ri_flg = RI_CENTER | RI_ENABLE_ALPHA | RI_PREFER_ALPHA |
-		 RI_FULLCLEAR;
+	ri->ri_flg = RI_CENTER | RI_ENABLE_ALPHA | RI_PREFER_ALPHA;
 
 	/*
 	 * we can't accelerate copycols() so instead of falling back to
@@ -1239,7 +1270,7 @@ ffb_init_screen(void *cookie, struct vco
 	ri->ri_bpos = 16;
 
 	rasops_init(ri, 0, 0);
-	ri->ri_caps = WSSCREEN_WSCOLORS;
+	ri->ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_UNDERLINE | WSSCREEN_REVERSE;
 	rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
 		sc->sc_width / ri->ri_font->fontwidth);
 

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Thu Apr 27 23:17:21 UTC 2017

Modified Files:
src/sys/arch/sparc64/dev: ffb.c

Log Message:
- don't blindly copy attribute bits which we don't support or which make no
  sense in the attribute buffer
- support WSATTR_UNDERLINE
- remove unused function


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc64/dev/ffb.c

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Apr 27 20:05:09 UTC 2017

Modified Files:
src/sys/arch/mips/mips: cache_r5k.c

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/mips/cache_r5k.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/mips/mips/cache_r5k.c
diff -u src/sys/arch/mips/mips/cache_r5k.c:1.19 src/sys/arch/mips/mips/cache_r5k.c:1.20
--- src/sys/arch/mips/mips/cache_r5k.c:1.19	Mon Oct 10 07:37:56 2016
+++ src/sys/arch/mips/mips/cache_r5k.c	Thu Apr 27 20:05:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache_r5k.c,v 1.19 2016/10/10 07:37:56 skrll Exp $	*/
+/*	$NetBSD: cache_r5k.c,v 1.20 2017/04/27 20:05:09 skrll Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cache_r5k.c,v 1.19 2016/10/10 07:37:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache_r5k.c,v 1.20 2017/04/27 20:05:09 skrll Exp $");
 
 #include 
 
@@ -134,7 +134,7 @@ r5k_picache_sync_range_index(vaddr_t va,
 
 	/*
 	 * If we are going to flush more than is in a way (or the stride
-	 * need for that way), we are flushing everything.
+	 * needed for that way), we are flushing everything.
 	 */
 	if (size >= way_size) {
 		r5k_picache_sync_all();

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Apr 27 20:05:09 UTC 2017

Modified Files:
src/sys/arch/mips/mips: cache_r5k.c

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mips/mips/cache_r5k.c

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Apr 27 19:40:55 UTC 2017

Modified Files:
src/sys/arch/mips/mips: cache_r4k_subr.S

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/cache_r4k_subr.S

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Apr 27 19:40:55 UTC 2017

Modified Files:
src/sys/arch/mips/mips: cache_r4k_subr.S

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/cache_r4k_subr.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/mips/mips/cache_r4k_subr.S
diff -u src/sys/arch/mips/mips/cache_r4k_subr.S:1.2 src/sys/arch/mips/mips/cache_r4k_subr.S:1.3
--- src/sys/arch/mips/mips/cache_r4k_subr.S:1.2	Mon Jul 11 16:15:36 2016
+++ src/sys/arch/mips/mips/cache_r4k_subr.S	Thu Apr 27 19:40:55 2017
@@ -37,7 +37,7 @@
 
 #include 
 
-RCSID("$NetBSD: cache_r4k_subr.S,v 1.2 2016/07/11 16:15:36 matt Exp $")
+RCSID("$NetBSD: cache_r4k_subr.S,v 1.3 2017/04/27 19:40:55 skrll Exp $")
 
 #include 
 
@@ -83,7 +83,7 @@ STATIC_LEAF_NOPROFILE(OPNAME(doop))
 	and	v1, a0, LINE_SIZE - 1		# get offset in cache line
 	xor	a0, v1# align start to cache line
 	PTR_ADDU a1, v1# add offset to size
-	PTR_ADDU a1, LINE_SIZE - 1		# size is now rouned
+	PTR_ADDU a1, LINE_SIZE - 1		# size is now rounded
 	PTR_SRL	t0, a1, LINE_SHIFT		# get # of cache lines
 
 	beqz	t0, 3f# bail if t0 is 0 (no lines)

CVS commit: src/sys/sys

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Apr 27 19:18:50 UTC 2017

Modified Files:
src/sys/sys: param.h

Log Message:
Welcome to 7.99.71, courtesy of a slight increment in vfs sanity.

*fs_remove no longer releases the caller's lock of dvp on exit.

Sorry for delay in bump.  Thanks, martin, for catching this!


To generate a diff of this commit:
cvs rdiff -u -r1.537 -r1.538 src/sys/sys/param.h

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

CVS commit: src/sys/sys

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Apr 27 19:18:50 UTC 2017

Modified Files:
src/sys/sys: param.h

Log Message:
Welcome to 7.99.71, courtesy of a slight increment in vfs sanity.

*fs_remove no longer releases the caller's lock of dvp on exit.

Sorry for delay in bump.  Thanks, martin, for catching this!


To generate a diff of this commit:
cvs rdiff -u -r1.537 -r1.538 src/sys/sys/param.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/sys/param.h
diff -u src/sys/sys/param.h:1.537 src/sys/sys/param.h:1.538
--- src/sys/sys/param.h:1.537	Mon Apr 17 08:34:58 2017
+++ src/sys/sys/param.h	Thu Apr 27 19:18:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.537 2017/04/17 08:34:58 hannken Exp $	*/
+/*	$NetBSD: param.h,v 1.538 2017/04/27 19:18:50 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	799007000	/* NetBSD 7.99.70 */
+#define	__NetBSD_Version__	799007100	/* NetBSD 7.99.71 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: src/bin/csh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 27 18:50:34 UTC 2017

Modified Files:
src/bin/csh: glob.c

Log Message:
switch to a backtracking instead of a recursive pattern matcher.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/csh/glob.c

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

Modified files:

Index: src/bin/csh/glob.c
diff -u src/bin/csh/glob.c:1.27 src/bin/csh/glob.c:1.28
--- src/bin/csh/glob.c:1.27	Tue Jul 16 13:47:43 2013
+++ src/bin/csh/glob.c	Thu Apr 27 14:50:34 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.c,v 1.27 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: glob.c,v 1.28 2017/04/27 18:50:34 christos Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: glob.c,v 1.27 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: glob.c,v 1.28 2017/04/27 18:50:34 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -89,7 +89,7 @@ static Char **libglob(Char **);
 static Char **globexpand(Char **);
 static int globbrace(Char *, Char *, Char ***);
 static void expbrace(Char ***, Char ***, size_t);
-static int pmatch(Char *, Char *);
+static int pmatch(const Char *, const Char *);
 static void pword(void);
 static void psave(int);
 static void backeval(Char *, int);
@@ -818,56 +818,74 @@ Gmatch(Char *string, Char *pattern)
 } 
 
 static int
-pmatch(Char *string, Char *pattern)
+pmatch(const Char *name, const Char *pat)
 {
 int match, negate_range;
-Char patternc, rangec, stringc;
+Char patc, namec, c;
+const Char *nameNext, *nameStart, *nameEnd, *patNext;
 
-for (;; ++string) {
-	stringc = *string & TRIM;
-	patternc = *pattern++;
-	switch (patternc) {
+nameNext = nameStart = name;
+patNext = pat;
+nameEnd = NULL;
+
+for (;;) {
+	namec = *name & TRIM;
+	if (namec == 0)
+	nameEnd = name;
+	patc = *pat;
+	switch (patc) {
 	case 0:
-	return (stringc == 0);
-	case '?':
-	if (stringc == 0)
-		return (0);
+	if (namec == 0)
+		return 1;
 	break;
+	case '?':
+	if (namec == 0)
+		break;
+	pat++;
+	name++;
+	continue;
 	case '*':
-	if (!*pattern)
-		return (1);
-	while (*string)
-		if (Gmatch(string++, pattern))
-		return (1);
-	return (0);
+	while ((pat[1] & TRIM) == '*')
+		pat++;
+	patNext = pat;
+	nameNext = name + 1;
+	pat++;
+	continue;
 	case '[':
 	match = 0;
-	if ((negate_range = (*pattern == '^')) != 0)
-		pattern++;
-	while ((rangec = *pattern++) != '\0') {
-		if (rangec == ']')
-		break;
-		if (match)
-		continue;
-		if (rangec == '-' && *(pattern-2) != '[' && *pattern  != ']') {
-		match = (stringc <= (*pattern & TRIM) &&
-			  (*(pattern-2) & TRIM) <= stringc);
-		pattern++;
-		}
-		else 
-		match = (stringc == (rangec & TRIM));
+	if (namec == 0)
+		break;
+	pat++;
+	name++;
+	if ((negate_range = (*pat == '^')) != 0)
+		pat++;
+	while ((c = *pat++) != ']') {
+		c &= TRIM;
+		if (*pat == '-') {
+		if (c <= namec && namec <= (pat[1] & TRIM))
+			match = 1;
+		pat += 2;
+		} else if (c == namec)
+		match = 1;
+		else if (c == 0)
+		stderror(ERR_NAME | ERR_MISSING, ']');
 	}
-	if (rangec == 0)
-		stderror(ERR_NAME | ERR_MISSING, ']');
 	if (match == negate_range)
-		return (0);
-	break;
+		break;
+	continue;
 	default:
-	if ((patternc & TRIM) != stringc)
-		return (0);
-	break;
-
+	if ((patc & TRIM) != namec)
+		break;
+	pat++;
+	name++;
+	continue;
+	}
+	if (nameNext != nameStart && (nameEnd == NULL || nameNext <= nameEnd)) {
+	pat = patNext;
+	name = nameNext;
+	continue;
 	}
+	return 0;
 }
 }
 

CVS commit: src/bin/csh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 27 18:50:34 UTC 2017

Modified Files:
src/bin/csh: glob.c

Log Message:
switch to a backtracking instead of a recursive pattern matcher.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/csh/glob.c

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

CVS commit: src/share/man/man4

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 27 17:32:26 UTC 2017

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

Log Message:
seems VirtualBox 5.1.20 doesn't have the buggy nvme(4) behaviour any more,
remove the note


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/nvme.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/nvme.4
diff -u src/share/man/man4/nvme.4:1.9 src/share/man/man4/nvme.4:1.10
--- src/share/man/man4/nvme.4:1.9	Sat Oct 22 07:36:36 2016
+++ src/share/man/man4/nvme.4	Thu Apr 27 17:32:26 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: nvme.4,v 1.9 2016/10/22 07:36:36 wiz Exp $
+.\"	$NetBSD: nvme.4,v 1.10 2017/04/27 17:32:26 jdolecek Exp $
 .\"	$OpenBSD: nvme.4,v 1.2 2016/04/14 11:53:37 jmc Exp $
 .\"
 .\" Copyright (c) 2016 David Gwynne 
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd October 21, 2016
+.Dd April 27, 2017
 .Dt NVME 4
 .Os
 .Sh NAME
@@ -133,17 +133,9 @@ Generation 3 slot.
 Such cards do not even probe when plugged
 into older generation slot.
 .Pp
-The driver also attaches and works fine for emulated
+The driver was also tested and confirmed working fine for emulated
 .Nm
-devices under QEMU and
+devices under QEMU 2.8.0 and
 .Tn Oracle
-.Tn VirtualBox .
-However, there seems to be some broken interaction between
 .Tn VirtualBox
-5.1.6
-and the driver, the emulated
-.Nm
-controller responds to commands only the first time it is attached,
-after reboot or module reload it stops responding.
-The virtual machine must be completely powered off
-(or even killed) to fix this.
+5.1.20.

CVS commit: src/share/man/man4

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 27 17:32:26 UTC 2017

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

Log Message:
seems VirtualBox 5.1.20 doesn't have the buggy nvme(4) behaviour any more,
remove the note


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/nvme.4

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

CVS commit: src/sys/dev

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 27 17:07:22 UTC 2017

Modified Files:
src/sys/dev: dksubr.c dkvar.h ld.c ldvar.h
src/sys/dev/ic: ld_nvme.c

Log Message:
do not attach nvme ld as randomness source - device is too fast, it overwhelms
the rndq handling code, and causes system crashes; gathering rnd there is
also bad idea from performance perspective


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/dksubr.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/dkvar.h
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ld.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ldvar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/ld_nvme.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.96 src/sys/dev/dksubr.c:1.97
--- src/sys/dev/dksubr.c:1.96	Sun Mar  5 23:07:12 2017
+++ src/sys/dev/dksubr.c	Thu Apr 27 17:07:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.96 2017/03/05 23:07:12 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.97 2017/04/27 17:07:22 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.96 2017/03/05 23:07:12 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.97 2017/04/27 17:07:22 jdolecek Exp $");
 
 #include 
 #include 
@@ -102,16 +102,20 @@ dk_attach(struct dk_softc *dksc)
 	dksc->sc_flags |= DKF_WARNLABEL | DKF_LABELSANITY;
 #endif
 
-	/* Attach the device into the rnd source list. */
-	rnd_attach_source(>sc_rnd_source, dksc->sc_xname,
-	RND_TYPE_DISK, RND_FLAG_DEFAULT);
+	if ((dksc->sc_flags & DKF_NO_RND) == 0) {
+		/* Attach the device into the rnd source list. */
+		rnd_attach_source(>sc_rnd_source, dksc->sc_xname,
+		RND_TYPE_DISK, RND_FLAG_DEFAULT);
+	}
 }
 
 void
 dk_detach(struct dk_softc *dksc)
 {
-	/* Unhook the entropy source. */
-	rnd_detach_source(>sc_rnd_source);
+	if ((dksc->sc_flags & DKF_NO_RND) == 0) {
+		/* Unhook the entropy source. */
+		rnd_detach_source(>sc_rnd_source);
+	}
 
 	dksc->sc_flags &= ~DKF_READYFORDUMP;
 	mutex_destroy(>sc_iolock);
@@ -458,7 +462,8 @@ dk_done1(struct dk_softc *dksc, struct b
 	if (lock)
 		mutex_exit(>sc_iolock);
 
-	rnd_add_uint32(>sc_rnd_source, bp->b_rawblkno);
+	if ((dksc->sc_flags & DKF_NO_RND) == 0)
+		rnd_add_uint32(>sc_rnd_source, bp->b_rawblkno);
 
 	biodone(bp);
 }

Index: src/sys/dev/dkvar.h
diff -u src/sys/dev/dkvar.h:1.28 src/sys/dev/dkvar.h:1.29
--- src/sys/dev/dkvar.h:1.28	Thu Dec 22 13:42:14 2016
+++ src/sys/dev/dkvar.h	Thu Apr 27 17:07:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dkvar.h,v 1.28 2016/12/22 13:42:14 mlelstv Exp $ */
+/* $NetBSD: dkvar.h,v 1.29 2017/04/27 17:07:22 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,6 +68,7 @@ struct dk_softc {
 #define DKF_KLABEL  0x0040 /* keep label on close */
 #define DKF_VLABEL  0x0080 /* label is valid */
 #define DKF_SLEEP   0x8000 /* dk_start/dk_done may sleep */
+#define DKF_NO_RND	0x0100 /* do not attach as rnd source */
 
 /* Mask of flags that dksubr.c understands, other flags are fair game */
 #define DK_FLAGMASK	0x

Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.100 src/sys/dev/ld.c:1.101
--- src/sys/dev/ld.c:1.100	Mon Feb 27 21:32:33 2017
+++ src/sys/dev/ld.c	Thu Apr 27 17:07:22 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld.c,v 1.100 2017/02/27 21:32:33 jdolecek Exp $	*/
+/*	$NetBSD: ld.c,v 1.101 2017/04/27 17:07:22 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.100 2017/02/27 21:32:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.101 2017/04/27 17:07:22 jdolecek Exp $");
 
 #include 
 #include 
@@ -149,6 +149,9 @@ ldattach(struct ld_softc *sc, const char
 
 	sc->sc_disksize512 = sc->sc_secperunit * sc->sc_secsize / DEV_BSIZE;
 
+	if (sc->sc_flags & LDF_NO_RND)
+		dksc->sc_flags |= DKF_NO_RND;
+
 	/* Attach dk and disk subsystems */
 	dk_attach(dksc);
 	disk_attach(>sc_dkdev);

Index: src/sys/dev/ldvar.h
diff -u src/sys/dev/ldvar.h:1.29 src/sys/dev/ldvar.h:1.30
--- src/sys/dev/ldvar.h:1.29	Mon Feb 27 21:32:33 2017
+++ src/sys/dev/ldvar.h	Thu Apr 27 17:07:22 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldvar.h,v 1.29 2017/02/27 21:32:33 jdolecek Exp $	*/
+/*	$NetBSD: ldvar.h,v 1.30 2017/04/27 17:07:22 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -67,6 +67,7 @@ struct ld_softc {
 /* sc_flags */
 #define	LDF_ENABLED	0x001		/* device enabled */
 #define	LDF_DRAIN	0x020		/* maxqueuecnt has changed; drain */
+#define	LDF_NO_RND	0x040		/* do not attach rnd source */
 
 int	ldadjqparam(struct ld_softc *, int);
 void	ldattach(struct ld_softc *, const char *);

Index: src/sys/dev/ic/ld_nvme.c
diff -u src/sys/dev/ic/ld_nvme.c:1.15 src/sys/dev/ic/ld_nvme.c:1.16
--- 

CVS commit: src/sys/dev

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 27 17:07:22 UTC 2017

Modified Files:
src/sys/dev: dksubr.c dkvar.h ld.c ldvar.h
src/sys/dev/ic: ld_nvme.c

Log Message:
do not attach nvme ld as randomness source - device is too fast, it overwhelms
the rndq handling code, and causes system crashes; gathering rnd there is
also bad idea from performance perspective


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/dksubr.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/dkvar.h
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ld.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ldvar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/ld_nvme.c

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

CVS commit: src/sys/kern

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Thu Apr 27 16:52:22 UTC 2017

Modified Files:
src/sys/kern: kern_event.c

Log Message:
Rearrange the if conditions in order to get rid of unnecessary indentation.

No functional change intended. ok christos@


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/kern_event.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/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.88 src/sys/kern/kern_event.c:1.89
--- src/sys/kern/kern_event.c:1.88	Thu Jul 14 18:16:51 2016
+++ src/sys/kern/kern_event.c	Thu Apr 27 16:52:22 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_event.c,v 1.88 2016/07/14 18:16:51 christos Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.89 2017/04/27 16:52:22 abhinav Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.88 2016/07/14 18:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.89 2017/04/27 16:52:22 abhinav Exp $");
 
 #include 
 #include 
@@ -868,21 +868,19 @@ kevent1(register_t *retval, int fd,
 			kevp->flags &= ~EV_SYSFLAGS;
 			/* register each knote */
 			error = kqueue_register(kq, kevp);
-			if (error || (kevp->flags & EV_RECEIPT)) {
-if (nevents != 0) {
-	kevp->flags = EV_ERROR;
-	kevp->data = error;
-	error = (*keops->keo_put_events)
-	(keops->keo_private, kevp,
-	eventlist, nerrors, 1);
-	if (error)
-		goto done;
-	nevents--;
-	nerrors++;
-} else {
-	goto done;
-}
-			}
+			if (!error && !(kevp->flags & EV_RECEIPT))
+continue;
+			if (nevents == 0)
+goto done;
+			kevp->flags = EV_ERROR;
+			kevp->data = error;
+			error = (*keops->keo_put_events)
+(keops->keo_private, kevp,
+ eventlist, nerrors, 1);
+			if (error)
+goto done;
+			nevents--;
+			nerrors++;
 		}
 		nchanges -= n;	/* update the results */
 		ichange += n;

CVS commit: src/sys/kern

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Thu Apr 27 16:52:22 UTC 2017

Modified Files:
src/sys/kern: kern_event.c

Log Message:
Rearrange the if conditions in order to get rid of unnecessary indentation.

No functional change intended. ok christos@


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/kern_event.c

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

CVS commit: [prg-localcount2] src/sys/dev

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 27 12:07:23 UTC 2017

Modified Files:
src/sys/dev [prg-localcount2]: cgd.c

Log Message:
Once more let's try to fix the exit path in cgdclose()


To generate a diff of this commit:
cvs rdiff -u -r1.114.4.2 -r1.114.4.3 src/sys/dev/cgd.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/cgd.c
diff -u src/sys/dev/cgd.c:1.114.4.2 src/sys/dev/cgd.c:1.114.4.3
--- src/sys/dev/cgd.c:1.114.4.2	Thu Apr 27 11:58:58 2017
+++ src/sys/dev/cgd.c	Thu Apr 27 12:07:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.114.4.2 2017/04/27 11:58:58 pgoyette Exp $ */
+/* $NetBSD: cgd.c,v 1.114.4.3 2017/04/27 12:07:23 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.114.4.2 2017/04/27 11:58:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.114.4.3 2017/04/27 12:07:23 pgoyette Exp $");
 
 #include 
 #include 
@@ -448,8 +448,8 @@ cgdclose(dev_t dev, int flags, int fmt, 
 		if ((error = cgd_destroy(cs->sc_dksc.sc_dev)) != 0) {
 			aprint_error_dev(dksc->sc_dev,
 			"unable to detach instance\n");
-			return error;
 		}
+		return error;
 	}
 	device_release(self);
 	return 0;

CVS commit: [prg-localcount2] src/sys/dev

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 27 12:07:23 UTC 2017

Modified Files:
src/sys/dev [prg-localcount2]: cgd.c

Log Message:
Once more let's try to fix the exit path in cgdclose()


To generate a diff of this commit:
cvs rdiff -u -r1.114.4.2 -r1.114.4.3 src/sys/dev/cgd.c

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

CVS commit: [prg-localcount2] src/sys/dev

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 27 11:58:58 UTC 2017

Modified Files:
src/sys/dev [prg-localcount2]: cgd.c

Log Message:
Fix checking of failure-to-spawn a unit (check the returned address for
NULL, vs the pointer to that address).

Ensure that that device_release() is called in all exit paths from cgd_close().

Update handling of CGDIOCCLR ioctl the same as CGDIOCSET.  In particular,
don't return without calling device_release(), as any subsequent attempt to
detach the device will hang forever waiting for its localcount to drain.


To generate a diff of this commit:
cvs rdiff -u -r1.114.4.1 -r1.114.4.2 src/sys/dev/cgd.c

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

CVS commit: [prg-localcount2] src/sys/dev

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 27 11:58:58 UTC 2017

Modified Files:
src/sys/dev [prg-localcount2]: cgd.c

Log Message:
Fix checking of failure-to-spawn a unit (check the returned address for
NULL, vs the pointer to that address).

Ensure that that device_release() is called in all exit paths from cgd_close().

Update handling of CGDIOCCLR ioctl the same as CGDIOCSET.  In particular,
don't return without calling device_release(), as any subsequent attempt to
detach the device will hang forever waiting for its localcount to drain.


To generate a diff of this commit:
cvs rdiff -u -r1.114.4.1 -r1.114.4.2 src/sys/dev/cgd.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/cgd.c
diff -u src/sys/dev/cgd.c:1.114.4.1 src/sys/dev/cgd.c:1.114.4.2
--- src/sys/dev/cgd.c:1.114.4.1	Thu Apr 27 05:36:35 2017
+++ src/sys/dev/cgd.c	Thu Apr 27 11:58:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.114.4.1 2017/04/27 05:36:35 pgoyette Exp $ */
+/* $NetBSD: cgd.c,v 1.114.4.2 2017/04/27 11:58:58 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.114.4.1 2017/04/27 05:36:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.114.4.2 2017/04/27 11:58:58 pgoyette Exp $");
 
 #include 
 #include 
@@ -388,8 +388,7 @@ cgd_spawn(int unit, device_t *self)
 	if (config_attach_pseudo(cf) == NULL)
 		return NULL;
 
-	*self = device_lookup_acquire(_cd, unit);
-	if (self == NULL)
+	if ((*self = device_lookup_acquire(_cd, unit)) == NULL)
 		return NULL;
 	else {
 		/*
@@ -451,8 +450,8 @@ cgdclose(dev_t dev, int flags, int fmt, 
 			"unable to detach instance\n");
 			return error;
 		}
-	} else
-		device_release(self);
+	}
+	device_release(self);
 	return 0;
 }
 
@@ -788,8 +787,10 @@ cgdioctl(dev_t dev, u_long cmd, void *da
 		break;
 	case CGDIOCCLR:
 		if (DK_BUSY(>sc_dksc, pmask))
-			return EBUSY;
-		return cgd_ioctl_clr(cs, l);
+			error = EBUSY;
+		else
+			error = cgd_ioctl_clr(cs, l);
+		break;
 	case DIOCGCACHE:
 	case DIOCCACHESYNC:
 		if (!DK_ATTACHED(dksc))

CVS commit: src/distrib/sets/lists/comp

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 27 11:02:14 UTC 2017

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
Remove a couple of over eager obsolete markers.


To generate a diff of this commit:
cvs rdiff -u -r1.2125 -r1.2126 src/distrib/sets/lists/comp/mi

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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2125 src/distrib/sets/lists/comp/mi:1.2126
--- src/distrib/sets/lists/comp/mi:1.2125	Thu Apr 20 13:11:03 2017
+++ src/distrib/sets/lists/comp/mi	Thu Apr 27 11:02:14 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2125 2017/04/20 13:11:03 joerg Exp $
+#	$NetBSD: mi,v 1.2126 2017/04/27 11:02:14 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -5125,7 +5125,7 @@
 ./usr/share/man/cat3/archive_entry_free.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_gid.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_gname.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_entry_gname_w.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_entry_gname_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_hardlink.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_hardlink_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_ino.0	comp-c-catman		.cat
@@ -5169,7 +5169,7 @@
 ./usr/share/man/cat3/archive_entry_set_nlink.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/archive_entry_set_pathname.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_perm.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_entry_set_rdev.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_entry_set_rdev.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_rdevmajor.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_rdevminor.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_set_size.0	comp-c-catman		.cat
@@ -5186,7 +5186,7 @@
 ./usr/share/man/cat3/archive_entry_time.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_uid.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_uname.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_entry_uname_w.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_entry_uname_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_unset_atime.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_unset_birthtime.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_unset_ctime.0	comp-c-catman		.cat
@@ -5324,7 +5324,7 @@
 ./usr/share/man/cat3/archive_write_finish_entry.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_format.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_free.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_write_get_bytes_in_last_block.0	comp-obsolete		obsolete
+./usr/share/man/cat3/archive_write_get_bytes_in_last_block.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_get_bytes_per_block.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_header.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_write_new.0	comp-c-catman		.cat
@@ -12745,7 +12745,7 @@
 ./usr/share/man/html3/archive_entry_free.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_gid.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_gname.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_entry_gname_w.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_entry_gname_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_hardlink.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_hardlink_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_ino.html	comp-c-htmlman		html
@@ -12789,7 +12789,7 @@
 ./usr/share/man/html3/archive_entry_set_nlink.html	comp-obsolete		obsolete
 ./usr/share/man/html3/archive_entry_set_pathname.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_perm.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_entry_set_rdev.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_entry_set_rdev.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_rdevmajor.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_rdevminor.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_set_size.html	comp-c-htmlman		html
@@ -12806,7 +12806,7 @@
 ./usr/share/man/html3/archive_entry_time.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_uid.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_uname.html	comp-c-htmlman		html
-./usr/share/man/html3/archive_entry_uname_w.html	comp-obsolete		obsolete
+./usr/share/man/html3/archive_entry_uname_w.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_unset_atime.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_unset_birthtime.html	comp-c-htmlman		html
 ./usr/share/man/html3/archive_entry_unset_ctime.html	

CVS commit: src/distrib/sets/lists/comp

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 27 11:02:14 UTC 2017

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
Remove a couple of over eager obsolete markers.


To generate a diff of this commit:
cvs rdiff -u -r1.2125 -r1.2126 src/distrib/sets/lists/comp/mi

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

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 10:17:12 UTC 2017

Modified Files:
src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh

Log Message:
Test transport mode as well as tunnel mode


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh

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

Modified files:

Index: src/tests/net/ipsec/t_ipsec_gif.sh
diff -u src/tests/net/ipsec/t_ipsec_gif.sh:1.1 src/tests/net/ipsec/t_ipsec_gif.sh:1.2
--- src/tests/net/ipsec/t_ipsec_gif.sh:1.1	Thu Apr 27 06:52:45 2017
+++ src/tests/net/ipsec/t_ipsec_gif.sh	Thu Apr 27 10:17:12 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ipsec_gif.sh,v 1.1 2017/04/27 06:52:45 ozaki-r Exp $
+#	$NetBSD: t_ipsec_gif.sh,v 1.2 2017/04/27 10:17:12 ozaki-r Exp $
 #
 # Copyright (c) 2017 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -61,14 +61,15 @@ make_gif_pktstr()
 
 test_ipsec4_gif()
 {
-	local proto=$1
-	local algo=$2
+	local mode=$1
+	local proto=$2
+	local algo=$3
 	local ip_local=10.0.1.2
 	local ip_gw_local=10.0.1.1
-	local ip_gw_local_tun=20.0.0.1
-	local ip_gw_local_gif=20.1.0.1
-	local ip_gw_remote_gif=20.1.0.2
-	local ip_gw_remote_tun=20.0.0.2
+	local ip_gwlo_tun=20.0.0.1
+	local ip_gwlo_gif=20.1.0.1
+	local ip_gwre_gif=20.1.0.2
+	local ip_gwre_tun=20.0.0.2
 	local ip_gw_remote=10.0.2.1
 	local ip_remote=10.0.2.2
 	local subnet_local=10.0.1.0
@@ -103,27 +104,27 @@ test_ipsec4_gif()
 
 	export RUMP_SERVER=$SOCK_TUN_LOCAL
 	atf_check -s exit:0 rump.ifconfig shmif0 $ip_gw_local/24
-	atf_check -s exit:0 rump.ifconfig shmif1 $ip_gw_local_tun/24
+	atf_check -s exit:0 rump.ifconfig shmif1 $ip_gwlo_tun/24
 	atf_check -s exit:0 rump.ifconfig gif0 create
 	atf_check -s exit:0 rump.ifconfig gif0 \
-	tunnel $ip_gw_local_tun $ip_gw_remote_tun
+	tunnel $ip_gwlo_tun $ip_gwre_tun
 	atf_check -s exit:0 rump.ifconfig gif0 \
-	inet $ip_gw_local_gif/32 $ip_gw_remote_gif
+	inet $ip_gwlo_gif/32 $ip_gwre_gif
 	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=1
 	atf_check -s exit:0 -o ignore \
-	rump.route -n add -net $subnet_remote $ip_gw_remote_gif
+	rump.route -n add -net $subnet_remote $ip_gwre_gif
 
 	export RUMP_SERVER=$SOCK_TUN_REMOTE
 	atf_check -s exit:0 rump.ifconfig shmif0 $ip_gw_remote/24
-	atf_check -s exit:0 rump.ifconfig shmif1 $ip_gw_remote_tun/24
+	atf_check -s exit:0 rump.ifconfig shmif1 $ip_gwre_tun/24
 	atf_check -s exit:0 rump.ifconfig gif0 create
 	atf_check -s exit:0 rump.ifconfig gif0 \
-	tunnel $ip_gw_remote_tun $ip_gw_local_tun
+	tunnel $ip_gwre_tun $ip_gwlo_tun
 	atf_check -s exit:0 rump.ifconfig gif0 \
-	inet $ip_gw_remote_gif/32 $ip_gw_local_gif
+	inet $ip_gwre_gif/32 $ip_gwlo_gif
 	atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=1
 	atf_check -s exit:0 -o ignore \
-	rump.route -n add -net $subnet_local $ip_gw_local_gif
+	rump.route -n add -net $subnet_local $ip_gwlo_gif
 
 	export RUMP_SERVER=$SOCK_REMOTE
 	atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote/24
@@ -138,74 +139,114 @@ test_ipsec4_gif()
 	atf_check -s exit:0 -o ignore rump.ping -c 1 -n -w 3 $ip_remote
 
 	extract_new_packets $BUS_TUNNEL > $outfile
-	str="$ip_gw_local_tun > $ip_gw_remote_tun:"
+	str="$ip_gwlo_tun > $ip_gwre_tun:"
 	str="$str $ip_local > $ip_remote: ICMP echo request,"
 	str="$str .+ \(ipip-proto-4\)"
 	atf_check -s exit:0 -o match:"$str" cat $outfile
-	str="$ip_gw_remote_tun > $ip_gw_local_tun:"
+	str="$ip_gwre_tun > $ip_gwlo_tun:"
 	str="$str $ip_remote > $ip_local: ICMP echo reply,"
 	str="$str .+ \(ipip-proto-4\)"
 	atf_check -s exit:0 -o match:"$str" cat $outfile
 
-	export RUMP_SERVER=$SOCK_TUN_LOCAL
-	# from https://www.netbsd.org/docs/network/ipsec/
-	cat > $tmpfile <<-EOF
-	add $ip_gw_local_tun $ip_gw_remote_tun $proto 1 $opt $algo $key;
-	add $ip_gw_remote_tun $ip_gw_local_tun $proto 10001 $opt $algo $key;
-	spdadd $subnet_local/24 $subnet_remote/24 any -P out ipsec
-	$proto/tunnel/$ip_gw_local_tun-$ip_gw_remote_tun/require;
-	spdadd $subnet_remote/24 $subnet_local/24 any -P in ipsec
-	$proto/tunnel/$ip_gw_remote_tun-$ip_gw_local_tun/require;
-	EOF
-	$DEBUG && cat $tmpfile
-	atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
-	$DEBUG && $HIJACKING setkey -D
-	atf_check -s exit:0 -o match:"$ip_gw_local_tun $ip_gw_remote_tun" \
-	$HIJACKING setkey -D
-	atf_check -s exit:0 -o match:"$ip_gw_remote_tun $ip_gw_local_tun" \
-	$HIJACKING setkey -D
-	# TODO: more detail checks
-
-	export RUMP_SERVER=$SOCK_TUN_REMOTE
-	cat > $tmpfile <<-EOF
-	add $ip_gw_local_tun $ip_gw_remote_tun $proto 1 $opt $algo $key;
-	add $ip_gw_remote_tun $ip_gw_local_tun $proto 10001 $opt $algo $key;
-	spdadd $subnet_remote/24 $subnet_local/24 any -P out ipsec
-	$proto/tunnel/$ip_gw_remote_tun-$ip_gw_local_tun/require;
-	spdadd $subnet_local/24 $subnet_remote/24 any -P in ipsec
-	

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 10:17:12 UTC 2017

Modified Files:
src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh

Log Message:
Test transport mode as well as tunnel mode


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh

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

CVS commit: src/sys/dev

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 27 10:01:54 UTC 2017

Modified Files:
src/sys/dev/isa: tpm_isa.c
src/sys/dev/pci: com_puc.c hdaudio_pci.c if_bge.c ismt.c lpt_puc.c
sdhc_pci.c uhci_pci.c

Log Message:
 Use {isa,pci}_intr_establish"_xname"() for intrctl(8).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/tpm_isa.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/com_puc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/hdaudio_pci.c
cvs rdiff -u -r1.309 -r1.310 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ismt.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/lpt_puc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/sdhc_pci.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/uhci_pci.c

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

CVS commit: src/sys/dev

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 27 10:01:54 UTC 2017

Modified Files:
src/sys/dev/isa: tpm_isa.c
src/sys/dev/pci: com_puc.c hdaudio_pci.c if_bge.c ismt.c lpt_puc.c
sdhc_pci.c uhci_pci.c

Log Message:
 Use {isa,pci}_intr_establish"_xname"() for intrctl(8).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/tpm_isa.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/com_puc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/hdaudio_pci.c
cvs rdiff -u -r1.309 -r1.310 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ismt.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/lpt_puc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/sdhc_pci.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/uhci_pci.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/isa/tpm_isa.c
diff -u src/sys/dev/isa/tpm_isa.c:1.2 src/sys/dev/isa/tpm_isa.c:1.3
--- src/sys/dev/isa/tpm_isa.c:1.2	Mon Feb  6 04:29:47 2012
+++ src/sys/dev/isa/tpm_isa.c	Thu Apr 27 10:01:53 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: tpm_isa.c,v 1.2 2012/02/06 04:29:47 christos Exp $	*/
+/*	$NetBSD: tpm_isa.c,v 1.3 2017/04/27 10:01:53 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009 Michael Shalayeff
@@ -19,7 +19,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tpm_isa.c,v 1.2 2012/02/06 04:29:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_isa.c,v 1.3 2017/04/27 10:01:53 msaitoh Exp $");
 
 #include 
 #include 
@@ -129,8 +129,9 @@ tpm_isa_attach(device_t parent, device_t
 	 */
 	if (sc->sc_init == tpm_tis12_init &&
 	ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
-	(sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
-	IST_EDGE, IPL_TTY, tpm_intr, sc)) == NULL) {
+	(sc->sc_ih = isa_intr_establish_xname(ia->ia_ic,
+	 ia->ia_irq[0].ir_irq, IST_EDGE, IPL_TTY, tpm_intr, sc,
+	 device_xname(sc->sc_dev))) == NULL) {
 		bus_space_unmap(sc->sc_bt, sc->sc_bh, TPM_SIZE);
 		aprint_error_dev(sc->sc_dev, "cannot establish interrupt\n");
 		return;

Index: src/sys/dev/pci/com_puc.c
diff -u src/sys/dev/pci/com_puc.c:1.23 src/sys/dev/pci/com_puc.c:1.24
--- src/sys/dev/pci/com_puc.c:1.23	Fri May 23 14:16:39 2014
+++ src/sys/dev/pci/com_puc.c	Thu Apr 27 10:01:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_puc.c,v 1.23 2014/05/23 14:16:39 msaitoh Exp $	*/
+/*	$NetBSD: com_puc.c,v 1.24 2017/04/27 10:01:54 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.23 2014/05/23 14:16:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.24 2017/04/27 10:01:54 msaitoh Exp $");
 
 #include 
 #include 
@@ -106,9 +106,10 @@ com_puc_attach(device_t parent, device_t
 	COM_INIT_REGS(sc->sc_regs, aa->t, aa->h, aa->a);
 	sc->sc_frequency = aa->flags & PUC_COM_CLOCKMASK;
 
-	intrstr = pci_intr_string(aa->pc, aa->intrhandle, intrbuf, sizeof(intrbuf));
-	psc->sc_ih = pci_intr_establish(aa->pc, aa->intrhandle, IPL_SERIAL,
-	comintr, sc);
+	intrstr = pci_intr_string(aa->pc, aa->intrhandle, intrbuf,
+	sizeof(intrbuf));
+	psc->sc_ih = pci_intr_establish_xname(aa->pc, aa->intrhandle,
+	IPL_SERIAL, comintr, sc, device_xname(self));
 	if (psc->sc_ih == NULL) {
 		aprint_error("couldn't establish interrupt");
 		if (intrstr != NULL)

Index: src/sys/dev/pci/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio_pci.c:1.6 src/sys/dev/pci/hdaudio_pci.c:1.7
--- src/sys/dev/pci/hdaudio_pci.c:1.6	Tue Jan 31 00:58:15 2017
+++ src/sys/dev/pci/hdaudio_pci.c	Thu Apr 27 10:01:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.6 2017/01/31 00:58:15 khorben Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.7 2017/04/27 10:01:54 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd 
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.6 2017/01/31 00:58:15 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.7 2017/04/27 10:01:54 msaitoh Exp $");
 
 #include 
 #include 
@@ -146,8 +146,8 @@ hdaudio_pci_attach(device_t parent, devi
 	}
 	intrstr = pci_intr_string(pa->pa_pc, sc->sc_pihp[0], intrbuf,
 	sizeof(intrbuf));
-	sc->sc_ih = pci_intr_establish(pa->pa_pc, sc->sc_pihp[0], IPL_AUDIO,
-	hdaudio_pci_intr, sc);
+	sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, sc->sc_pihp[0],
+	IPL_AUDIO, hdaudio_pci_intr, sc, device_xname(self));
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt");
 		if (intrstr)

Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.309 src/sys/dev/pci/if_bge.c:1.310
--- src/sys/dev/pci/if_bge.c:1.309	Tue Apr 25 17:11:47 2017
+++ src/sys/dev/pci/if_bge.c	Thu Apr 27 10:01:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.309 2017/04/25 17:11:47 snj Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.310 2017/04/27 10:01:54 msaitoh Exp $	*/
 
 /*
  * 

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 09:43:52 UTC 2017

Modified Files:
src/sys/netipsec: keysock.c

Log Message:
Fix KASSERT; restore a lost statement


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/netipsec/keysock.c

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

CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 09:43:52 UTC 2017

Modified Files:
src/sys/netipsec: keysock.c

Log Message:
Fix KASSERT; restore a lost statement


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/netipsec/keysock.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/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.53 src/sys/netipsec/keysock.c:1.54
--- src/sys/netipsec/keysock.c:1.53	Fri Apr 21 08:38:18 2017
+++ src/sys/netipsec/keysock.c	Thu Apr 27 09:43:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: keysock.c,v 1.53 2017/04/21 08:38:18 ozaki-r Exp $	*/
+/*	$NetBSD: keysock.c,v 1.54 2017/04/27 09:43:52 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.53 2017/04/21 08:38:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.54 2017/04/27 09:43:52 ozaki-r Exp $");
 
 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
 
@@ -297,7 +297,7 @@ key_sendup_mbuf(struct socket *so, struc
 	int sbprio = 0; /* XXX should be a parameter */
 
 	KASSERT(m != NULL);
-	KASSERT(so != NULL);
+	KASSERT(so != NULL || target != KEY_SENDUP_ONE);
 
 	/*
 	 * RFC 2367 says ACQUIRE and other kernel-generated messages

CVS commit: src/usr.bin/man

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Thu Apr 27 09:31:51 UTC 2017

Modified Files:
src/usr.bin/man: man.c

Log Message:
Fix comment indentation at couple of places: Use \t instead of space


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/man/man.c

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

CVS commit: src/usr.bin/man

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Thu Apr 27 09:31:51 UTC 2017

Modified Files:
src/usr.bin/man: man.c

Log Message:
Fix comment indentation at couple of places: Use \t instead of space


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/man/man.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/man/man.c
diff -u src/usr.bin/man/man.c:1.64 src/usr.bin/man/man.c:1.65
--- src/usr.bin/man/man.c:1.64	Thu Jun 16 15:10:58 2016
+++ src/usr.bin/man/man.c	Thu Apr 27 09:31:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: man.c,v 1.64 2016/06/16 15:10:58 abhinav Exp $	*/
+/*	$NetBSD: man.c,v 1.65 2017/04/27 09:31:50 abhinav Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
 #if 0
 static char sccsid[] = "@(#)man.c	8.17 (Berkeley) 1/31/95";
 #else
-__RCSID("$NetBSD: man.c,v 1.64 2016/06/16 15:10:58 abhinav Exp $");
+__RCSID("$NetBSD: man.c,v 1.65 2017/04/27 09:31:50 abhinav Exp $");
 #endif
 #endif /* not lint */
 
@@ -293,7 +293,7 @@ main(int argc, char **argv)
 	/*
 	 * [2] section can now only be non-null if the user asked for
 	 * a section and that section's elements did not have 
- * absolute paths.  in this case we use the section's
+	 * absolute paths.  in this case we use the section's
 	 * elements to override _subdir from the config file.
 	 *
 	 * after this step, we are done processing "m.section"...
@@ -428,7 +428,7 @@ main(int argc, char **argv)
 		
 	/*
 	 * normal case - we display things in a single command, so
- * build a list of things to display.  first compute total
+	 * build a list of things to display.  first compute total
 	 * length of buffer we will need so we can malloc it.
 	 */
 	for (ap = pg.gl_pathv, len = m.pagerlen + 1; *ap != NULL; ++ap) {

CVS commit: src/libexec/ld.elf_so

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 27 08:37:15 UTC 2017

Modified Files:
src/libexec/ld.elf_so: reloc.c

Log Message:
PR port-macppc/47464 - Old binutils generated bogus zero-sized COPY
relocations for _SDA_BASE_ and _SDA2_BASE_ that happened to work by
accident.  They no longer happen to work when old binaries are run on
newer systems.  Explicitly ignore these bogus relocations.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/libexec/ld.elf_so/reloc.c

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

CVS commit: src/libexec/ld.elf_so

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 27 08:37:15 UTC 2017

Modified Files:
src/libexec/ld.elf_so: reloc.c

Log Message:
PR port-macppc/47464 - Old binutils generated bogus zero-sized COPY
relocations for _SDA_BASE_ and _SDA2_BASE_ that happened to work by
accident.  They no longer happen to work when old binaries are run on
newer systems.  Explicitly ignore these bogus relocations.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/libexec/ld.elf_so/reloc.c

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

Modified files:

Index: src/libexec/ld.elf_so/reloc.c
diff -u src/libexec/ld.elf_so/reloc.c:1.109 src/libexec/ld.elf_so/reloc.c:1.110
--- src/libexec/ld.elf_so/reloc.c:1.109	Tue Jun 14 13:06:41 2016
+++ src/libexec/ld.elf_so/reloc.c	Thu Apr 27 08:37:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: reloc.c,v 1.109 2016/06/14 13:06:41 christos Exp $	 */
+/*	$NetBSD: reloc.c,v 1.110 2017/04/27 08:37:15 uwe Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: reloc.c,v 1.109 2016/06/14 13:06:41 christos Exp $");
+__RCSID("$NetBSD: reloc.c,v 1.110 2017/04/27 08:37:15 uwe Exp $");
 #endif /* not lint */
 
 #include 
@@ -73,6 +73,22 @@ _rtld_do_copy_relocation(const Obj_Entry
 	const Elf_Sym  *srcsym = NULL;
 	Obj_Entry  *srcobj;
 
+	if (__predict_false(size == 0)) {
+#if defined(__powerpc__) && !defined(__LP64) /* PR port-macppc/47464 */
+		if (strcmp(name, "_SDA_BASE_") == 0
+		|| strcmp(name, "_SDA2_BASE_") == 0)
+		{
+			rdbg(("COPY %s %s --> ignoring old binutils bug",
+			  dstobj->path, name));
+			return 0;
+		}
+#endif
+#if 0 /* shall we warn? */
+		xwarnx("%s: zero size COPY relocation for \"%s\"",
+		   dstobj->path, name);
+#endif
+	}
+
 	for (srcobj = dstobj->next; srcobj != NULL; srcobj = srcobj->next) {
 		srcsym = _rtld_symlook_obj(name, hash, srcobj, 0,
 		_rtld_fetch_ventry(dstobj, ELF_R_SYM(rela->r_info)));

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 08:06:59 UTC 2017

Modified Files:
src/tests/net/ipsec: algorithms.sh

Log Message:
Prefer rijndael-cbc


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/ipsec/algorithms.sh

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

Modified files:

Index: src/tests/net/ipsec/algorithms.sh
diff -u src/tests/net/ipsec/algorithms.sh:1.2 src/tests/net/ipsec/algorithms.sh:1.3
--- src/tests/net/ipsec/algorithms.sh:1.2	Thu Apr 27 06:50:42 2017
+++ src/tests/net/ipsec/algorithms.sh	Thu Apr 27 08:06:59 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: algorithms.sh,v 1.2 2017/04/27 06:50:42 ozaki-r Exp $
+#	$NetBSD: algorithms.sh,v 1.3 2017/04/27 08:06:59 ozaki-r Exp $
 #
 # Copyright (c) 2017 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -27,7 +27,7 @@
 
 ESP_ENCRYPTION_ALGORITHMS="des-cbc 3des-cbc null blowfish-cbc cast128-cbc \
 des-deriv rijndael-cbc aes-ctr camellia-cbc aes-gcm-16 aes-gmac"
-ESP_ENCRYPTION_ALGORITHMS_MINIMUM="null aes-ctr"
+ESP_ENCRYPTION_ALGORITHMS_MINIMUM="null rijndael-cbc"
 
 # Valid key lengths of ESP encription algorithms
 #des-cbc 64

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 08:06:59 UTC 2017

Modified Files:
src/tests/net/ipsec: algorithms.sh

Log Message:
Prefer rijndael-cbc


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/ipsec/algorithms.sh

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

CVS commit: src/usr.sbin/makemandb

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Thu Apr 27 08:02:24 UTC 2017

Modified Files:
src/usr.sbin/makemandb: apropos-utils.c

Log Message:
Disable the database compression if DEBUG is defined.

When debugging makemandb(8), it helps to be able to view the text being
stored in the database.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/makemandb/apropos-utils.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.sbin/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.31 src/usr.sbin/makemandb/apropos-utils.c:1.32
--- src/usr.sbin/makemandb/apropos-utils.c:1.31	Sun Apr 23 13:52:57 2017
+++ src/usr.sbin/makemandb/apropos-utils.c	Thu Apr 27 08:02:24 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: apropos-utils.c,v 1.31 2017/04/23 13:52:57 abhinav Exp $	*/
+/*	$NetBSD: apropos-utils.c,v 1.32 2017/04/27 08:02:24 abhinav Exp $	*/
 /*-
  * Copyright (c) 2011 Abhinav Upadhyay 
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: apropos-utils.c,v 1.31 2017/04/23 13:52:57 abhinav Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.32 2017/04/27 08:02:24 abhinav Exp $");
 
 #include 
 #include 
@@ -176,8 +176,10 @@ create_db(sqlite3 *db)
 	"CREATE VIRTUAL TABLE mandb USING fts4(section, name, "
 		"name_desc, desc, lib, return_vals, env, files, "
 		"exit_status, diagnostics, errors, md5_hash UNIQUE, machine, "
-		"compress=zip, uncompress=unzip, tokenize=porter, "
-		"notindexed=section, notindexed=md5_hash); "
+#ifndef DEBUG		
+		"compress=zip, uncompress=unzip, "
+#endif		
+		"tokenize=porter, notindexed=section, notindexed=md5_hash); "
 	//mandb_meta
 	"CREATE TABLE IF NOT EXISTS mandb_meta(device, inode, mtime, "
 		"file UNIQUE, md5_hash UNIQUE, id  INTEGER PRIMARY KEY); "

CVS commit: src/usr.sbin/makemandb

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Thu Apr 27 08:02:24 UTC 2017

Modified Files:
src/usr.sbin/makemandb: apropos-utils.c

Log Message:
Disable the database compression if DEBUG is defined.

When debugging makemandb(8), it helps to be able to view the text being
stored in the database.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/makemandb/apropos-utils.c

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

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 06:53:44 UTC 2017

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/ipsec: Makefile
Added Files:
src/tests/net/ipsec: t_ipsec_l2tp.sh

Log Message:
Add test cases for L2TP/IPsec


To generate a diff of this commit:
cvs rdiff -u -r1.736 -r1.737 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/net/ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/ipsec/t_ipsec_l2tp.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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.736 src/distrib/sets/lists/tests/mi:1.737
--- src/distrib/sets/lists/tests/mi:1.736	Thu Apr 27 06:52:45 2017
+++ src/distrib/sets/lists/tests/mi	Thu Apr 27 06:53:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.736 2017/04/27 06:52:45 ozaki-r Exp $
+# $NetBSD: mi,v 1.737 2017/04/27 06:53:44 ozaki-r Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3304,6 +3304,7 @@
 ./usr/tests/net/ipsec/t_ipsec_transport		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_tunnel		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/mcasttests-net-tests		compattestfile,atf
 ./usr/tests/net/mcast/Atffile			tests-net-tests		atf,rump
 ./usr/tests/net/mcast/Kyuafile			tests-net-tests		atf,rump,kyua

Index: src/tests/net/ipsec/Makefile
diff -u src/tests/net/ipsec/Makefile:1.2 src/tests/net/ipsec/Makefile:1.3
--- src/tests/net/ipsec/Makefile:1.2	Thu Apr 27 06:52:45 2017
+++ src/tests/net/ipsec/Makefile	Thu Apr 27 06:53:44 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2017/04/27 06:52:45 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.3 2017/04/27 06:53:44 ozaki-r Exp $
 #
 
 .include 
 
 TESTSDIR=	${TESTSBASE}/net/ipsec
 
-.for name in ipsec_ah_keys ipsec_esp_keys ipsec_gif ipsec_sysctl \
+.for name in ipsec_ah_keys ipsec_esp_keys ipsec_gif ipsec_l2tp ipsec_sysctl \
 ipsec_transport ipsec_tunnel
 TESTS_SH+=		t_${name}
 TESTS_SH_SRC_t_${name}=	../net_common.sh ./algorithms.sh t_${name}.sh

Added files:

Index: src/tests/net/ipsec/t_ipsec_l2tp.sh
diff -u /dev/null src/tests/net/ipsec/t_ipsec_l2tp.sh:1.1
--- /dev/null	Thu Apr 27 06:53:44 2017
+++ src/tests/net/ipsec/t_ipsec_l2tp.sh	Thu Apr 27 06:53:44 2017
@@ -0,0 +1,370 @@
+#	$NetBSD: t_ipsec_l2tp.sh,v 1.1 2017/04/27 06:53:44 ozaki-r Exp $
+#
+# Copyright (c) 2017 Internet Initiative Japan Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+SOCK_LOCAL=unix://ipsec_l2tp_local
+SOCK_TUN_LOCAL=unix://ipsec_l2tp_tunel_local
+SOCK_TUN_REMOTE=unix://ipsec_l2tp_tunnel_remote
+SOCK_REMOTE=unix://ipsec_l2tp_remote
+BUS_LOCAL=./bus_ipsec_local
+BUS_TUNNEL=./bus_ipsec_tunnel
+BUS_REMOTE=./bus_ipsec_remote
+
+DEBUG=${DEBUG:-false}
+
+make_l2tp_pktstr()
+{
+	local src=$1
+	local dst=$2
+	local proto=$3
+	local ipproto=$4
+	local proto_cap= proto_str=
+
+	if [ $proto = esp ]; then
+		proto_cap=ESP
+	else
+		proto_cap=AH
+		if [ $ipproto = ipv4 ]; then
+			proto_str="ip-proto-115 102 \(ipip-proto-4\)"
+		else
+			proto_str="ip-proto-115"
+		fi
+	fi
+
+	echo "$src > $dst: $proto_cap.+$proto_str"
+}
+
+test_ipsec4_l2tp()
+{
+	local proto=$1
+	local algo=$2
+	local ip_local=10.0.0.1
+	local ip_gw_local_tun=20.0.0.1
+	local ip_gw_remote_tun=20.0.0.2
+	local ip_remote=10.0.0.2
+	local subnet_local=20.0.0.0
+	local subnet_remote=20.0.0.0
+	local keylen=$(get_one_valid_keylen $algo)
+	local key=$(generate_key $keylen)
+	local tmpfile=./tmp
+	local outfile=./out
+	local opt= str=
+
+	

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 06:53:44 UTC 2017

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/ipsec: Makefile
Added Files:
src/tests/net/ipsec: t_ipsec_l2tp.sh

Log Message:
Add test cases for L2TP/IPsec


To generate a diff of this commit:
cvs rdiff -u -r1.736 -r1.737 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/net/ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/ipsec/t_ipsec_l2tp.sh

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

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 06:52:45 UTC 2017

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/ipsec: Makefile
Added Files:
src/tests/net/ipsec: t_ipsec_gif.sh

Log Message:
Add test cases for gif/IPsec


To generate a diff of this commit:
cvs rdiff -u -r1.735 -r1.736 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/ipsec/t_ipsec_gif.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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.735 src/distrib/sets/lists/tests/mi:1.736
--- src/distrib/sets/lists/tests/mi:1.735	Mon Apr 17 09:06:55 2017
+++ src/distrib/sets/lists/tests/mi	Thu Apr 27 06:52:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.735 2017/04/17 09:06:55 knakahara Exp $
+# $NetBSD: mi,v 1.736 2017/04/27 06:52:45 ozaki-r Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3303,6 +3303,7 @@
 ./usr/tests/net/ipsec/t_ipsec_sysctl		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_transport		tests-net-tests		atf,rump
 ./usr/tests/net/ipsec/t_ipsec_tunnel		tests-net-tests		atf,rump
+./usr/tests/net/ipsec/t_ipsec_gif		tests-net-tests		atf,rump
 ./usr/tests/net/mcasttests-net-tests		compattestfile,atf
 ./usr/tests/net/mcast/Atffile			tests-net-tests		atf,rump
 ./usr/tests/net/mcast/Kyuafile			tests-net-tests		atf,rump,kyua

Index: src/tests/net/ipsec/Makefile
diff -u src/tests/net/ipsec/Makefile:1.1 src/tests/net/ipsec/Makefile:1.2
--- src/tests/net/ipsec/Makefile:1.1	Fri Apr 14 02:56:49 2017
+++ src/tests/net/ipsec/Makefile	Thu Apr 27 06:52:45 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2017/04/14 02:56:49 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.2 2017/04/27 06:52:45 ozaki-r Exp $
 #
 
 .include 
 
 TESTSDIR=	${TESTSBASE}/net/ipsec
 
-.for name in ipsec_ah_keys ipsec_esp_keys ipsec_sysctl ipsec_transport \
-ipsec_tunnel
+.for name in ipsec_ah_keys ipsec_esp_keys ipsec_gif ipsec_sysctl \
+ipsec_transport ipsec_tunnel
 TESTS_SH+=		t_${name}
 TESTS_SH_SRC_t_${name}=	../net_common.sh ./algorithms.sh t_${name}.sh
 .endfor

Added files:

Index: src/tests/net/ipsec/t_ipsec_gif.sh
diff -u /dev/null src/tests/net/ipsec/t_ipsec_gif.sh:1.1
--- /dev/null	Thu Apr 27 06:52:45 2017
+++ src/tests/net/ipsec/t_ipsec_gif.sh	Thu Apr 27 06:52:45 2017
@@ -0,0 +1,389 @@
+#	$NetBSD: t_ipsec_gif.sh,v 1.1 2017/04/27 06:52:45 ozaki-r Exp $
+#
+# Copyright (c) 2017 Internet Initiative Japan Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+SOCK_LOCAL=unix://ipsec_gif_local
+SOCK_TUN_LOCAL=unix://ipsec_gif_tunel_local
+SOCK_TUN_REMOTE=unix://ipsec_gif_tunnel_remote
+SOCK_REMOTE=unix://ipsec_gif_remote
+BUS_LOCAL=./bus_ipsec_local
+BUS_TUNNEL=./bus_ipsec_tunnel
+BUS_REMOTE=./bus_ipsec_remote
+
+DEBUG=${DEBUG:-false}
+
+make_gif_pktstr()
+{
+	local src=$1
+	local dst=$2
+	local src_inner=$3
+	local dst_inner=$4
+	local proto=$5
+	local ipproto=$6
+	local proto_cap= inner_str=
+
+	if [ $proto = esp ]; then
+		proto_cap=ESP
+	else
+		proto_cap=AH
+		if [ $ipproto = ipv4 ]; then
+			inner_str="$src_inner > $dst_inner:.+\(ipip-proto-4\)"
+		else
+			inner_str="$src_inner > $dst_inner"
+		fi
+	fi
+
+	echo "$src > $dst: $proto_cap.+$inner_str"
+}
+
+test_ipsec4_gif()
+{
+	local proto=$1
+	local algo=$2
+	local ip_local=10.0.1.2
+	local ip_gw_local=10.0.1.1
+	local ip_gw_local_tun=20.0.0.1
+	local ip_gw_local_gif=20.1.0.1
+	local ip_gw_remote_gif=20.1.0.2
+	local ip_gw_remote_tun=20.0.0.2
+	local ip_gw_remote=10.0.2.1
+	local ip_remote=10.0.2.2
+	local 

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 06:52:45 UTC 2017

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/ipsec: Makefile
Added Files:
src/tests/net/ipsec: t_ipsec_gif.sh

Log Message:
Add test cases for gif/IPsec


To generate a diff of this commit:
cvs rdiff -u -r1.735 -r1.736 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/ipsec/t_ipsec_gif.sh

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

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 06:50:42 UTC 2017

Modified Files:
src/tests/net/ipsec: algorithms.sh

Log Message:
Add minimum sets of algorithms for testing


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/algorithms.sh

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

Modified files:

Index: src/tests/net/ipsec/algorithms.sh
diff -u src/tests/net/ipsec/algorithms.sh:1.1 src/tests/net/ipsec/algorithms.sh:1.2
--- src/tests/net/ipsec/algorithms.sh:1.1	Fri Apr 14 02:56:49 2017
+++ src/tests/net/ipsec/algorithms.sh	Thu Apr 27 06:50:42 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: algorithms.sh,v 1.1 2017/04/14 02:56:49 ozaki-r Exp $
+#	$NetBSD: algorithms.sh,v 1.2 2017/04/27 06:50:42 ozaki-r Exp $
 #
 # Copyright (c) 2017 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -27,6 +27,7 @@
 
 ESP_ENCRYPTION_ALGORITHMS="des-cbc 3des-cbc null blowfish-cbc cast128-cbc \
 des-deriv rijndael-cbc aes-ctr camellia-cbc aes-gcm-16 aes-gmac"
+ESP_ENCRYPTION_ALGORITHMS_MINIMUM="null aes-ctr"
 
 # Valid key lengths of ESP encription algorithms
 #des-cbc 64
@@ -72,6 +73,7 @@ invalid_keys_aesgmac="152 168 216 232 28
 
 AH_AUTHENTICATION_ALGORITHMS="hmac-md5 hmac-sha1 keyed-md5 keyed-sha1 null \
 hmac-sha256 hmac-sha384 hmac-sha512 hmac-ripemd160 aes-xcbc-mac"
+AH_AUTHENTICATION_ALGORITHMS_MINIMUM="null hmac-sha512"
 
 # Valid key lengths of AH authentication algorithms
 #hmac-md5128

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 27 06:50:42 UTC 2017

Modified Files:
src/tests/net/ipsec: algorithms.sh

Log Message:
Add minimum sets of algorithms for testing


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/algorithms.sh

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