CVS commit: src/sys/ufs/lfs

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Apr  1 01:50:02 UTC 2017

Modified Files:
src/sys/ufs/lfs: lfs.h lfs_vfsops.c lfs_vnops.c

Log Message:
switch lfs_sleepers to condvar (from mtsleep)


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.353 -r1.354 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.307 -r1.308 src/sys/ufs/lfs/lfs_vnops.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/ufs/lfs/lfs.h
diff -u src/sys/ufs/lfs/lfs.h:1.199 src/sys/ufs/lfs/lfs.h:1.200
--- src/sys/ufs/lfs/lfs.h:1.199	Mon Jun 20 03:25:46 2016
+++ src/sys/ufs/lfs/lfs.h	Sat Apr  1 01:50:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs.h,v 1.199 2016/06/20 03:25:46 dholland Exp $	*/
+/*	$NetBSD: lfs.h,v 1.200 2017/04/01 01:50:02 maya Exp $	*/
 
 /*  from NetBSD: dinode.h,v 1.25 2016/01/22 23:06:10 dholland Exp  */
 /*  from NetBSD: dir.h,v 1.25 2015/09/01 06:16:03 dholland Exp  */
@@ -1018,6 +1018,7 @@ struct lfs {
 	daddr_t  lfs_cleanint[LFS_MAX_CLEANIND]; /* Active cleaning intervals */
 	int 	 lfs_cleanind;		/* Index into intervals */
 	int lfs_sleepers;		/* # procs sleeping this fs */
+	kcondvar_t lfs_sleeperscv;	
 	int lfs_pages;			/* dirty pages blaming this fs */
 	lfs_bm_t *lfs_ino_bitmap;	/* Inuse inodes bitmap */
 	int lfs_nowrap;			/* Suspend log wrap */

Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.353 src/sys/ufs/lfs/lfs_vfsops.c:1.354
--- src/sys/ufs/lfs/lfs_vfsops.c:1.353	Mon Mar 13 14:24:20 2017
+++ src/sys/ufs/lfs/lfs_vfsops.c	Sat Apr  1 01:50:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_vfsops.c,v 1.353 2017/03/13 14:24:20 riastradh Exp $	*/
+/*	$NetBSD: lfs_vfsops.c,v 1.354 2017/04/01 01:50:02 maya Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.353 2017/03/13 14:24:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.354 2017/04/01 01:50:02 maya Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
@@ -1097,6 +1097,7 @@ lfs_mountfs(struct vnode *devvp, struct 
 	fs->lfs_pages = 0;
 	rw_init(>lfs_fraglock);
 	rw_init(>lfs_iflock);
+	cv_init(>lfs_sleeperscv, "lfs_slp");
 	cv_init(>lfs_stopcv, "lfsstop");
 
 	/* Set the file system readonly/modify bits. */
@@ -1349,8 +1350,7 @@ lfs_unmount(struct mount *mp, int mntfla
 	lfs_wakeup_cleaner(fs);
 	mutex_enter(_lock);
 	while (fs->lfs_sleepers)
-		mtsleep(>lfs_sleepers, PRIBIO + 1, "lfs_sleepers", 0,
-			_lock);
+		cv_wait(>lfs_sleeperscv, _lock);
 	mutex_exit(_lock);
 
 #ifdef LFS_EXTATTR
@@ -1414,6 +1414,7 @@ lfs_unmount(struct mount *mp, int mntfla
 	free(fs->lfs_suflags[1], M_SEGMENT);
 	free(fs->lfs_suflags, M_SEGMENT);
 	lfs_free_resblks(fs);
+	cv_destroy(>lfs_sleeperscv);
 	cv_destroy(>lfs_stopcv);
 	rw_destroy(>lfs_fraglock);
 	rw_destroy(>lfs_iflock);

Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.307 src/sys/ufs/lfs/lfs_vnops.c:1.308
--- src/sys/ufs/lfs/lfs_vnops.c:1.307	Thu Mar 30 09:10:08 2017
+++ src/sys/ufs/lfs/lfs_vnops.c	Sat Apr  1 01:50:02 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_vnops.c,v 1.307 2017/03/30 09:10:08 hannken Exp $	*/
+/*	$NetBSD: lfs_vnops.c,v 1.308 2017/04/01 01:50:02 maya Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.307 2017/03/30 09:10:08 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.308 2017/04/01 01:50:02 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1890,7 +1890,7 @@ segwait_common:
 
 		mutex_enter(_lock);
 		if (--fs->lfs_sleepers == 0)
-			wakeup(>lfs_sleepers);
+			cv_broadcast(>lfs_sleeperscv);
 		mutex_exit(_lock);
 		return error;
 
@@ -1933,7 +1933,7 @@ segwait_common:
 		}
 		mutex_enter(_lock);
 		if (--fs->lfs_sleepers == 0)
-			wakeup(>lfs_sleepers);
+			cv_broadcast(>lfs_sleeperscv);
 		mutex_exit(_lock);
 		lfs_free(fs, blkiov, LFS_NB_BLKIOV);
 		return error;
@@ -1964,7 +1964,7 @@ segwait_common:
 	blkcnt * sizeof(BLOCK_INFO));
 		mutex_enter(_lock);
 		if (--fs->lfs_sleepers == 0)
-			wakeup(>lfs_sleepers);
+			cv_broadcast(>lfs_sleeperscv);
 		mutex_exit(_lock);
 		lfs_free(fs, blkiov, LFS_NB_BLKIOV);
 		return error;

CVS commit: src/sys/ufs/lfs

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sat Apr  1 00:40:42 UTC 2017

Modified Files:
src/sys/ufs/lfs: lfs_inode.c

Log Message:
Simplify locking


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/ufs/lfs/lfs_inode.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/ufs/lfs/lfs_inode.c
diff -u src/sys/ufs/lfs/lfs_inode.c:1.154 src/sys/ufs/lfs/lfs_inode.c:1.155
--- src/sys/ufs/lfs/lfs_inode.c:1.154	Fri Mar 31 23:00:21 2017
+++ src/sys/ufs/lfs/lfs_inode.c	Sat Apr  1 00:40:42 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_inode.c,v 1.154 2017/03/31 23:00:21 maya Exp $	*/
+/*	$NetBSD: lfs_inode.c,v 1.155 2017/04/01 00:40:42 maya Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.154 2017/03/31 23:00:21 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.155 2017/04/01 00:40:42 maya Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -856,7 +856,7 @@ static int
 lfs_vtruncbuf(struct vnode *vp, daddr_t lbn, bool catch, int slptimeo)
 {
 	struct buf *bp, *nbp;
-	int error;
+	int error = 0;
 	struct lfs *fs;
 	voff_t off;
 
@@ -879,10 +879,9 @@ restart:	
 		error = bbusy(bp, catch, slptimeo, NULL);
 		if (error == EPASSTHROUGH)
 			goto restart;
-		if (error != 0) {
-			mutex_exit(_lock);
-			return (error);
-		}
+		if (error)
+			goto exit;
+
 		mutex_enter(bp->b_objlock);
 		if (bp->b_oflags & BO_DELWRI) {
 			bp->b_oflags &= ~BO_DELWRI;
@@ -901,10 +900,9 @@ restart:	
 		error = bbusy(bp, catch, slptimeo, NULL);
 		if (error == EPASSTHROUGH)
 			goto restart;
-		if (error != 0) {
-			mutex_exit(_lock);
-			return (error);
-		}
+		if (error)
+			goto exit;
+
 		mutex_enter(bp->b_objlock);
 		if (bp->b_oflags & BO_DELWRI) {
 			bp->b_oflags &= ~BO_DELWRI;
@@ -915,8 +913,9 @@ restart:	
 		LFS_UNLOCK_BUF(bp);
 		brelsel(bp, BC_INVAL | BC_VFLUSH);
 	}
+exit:
 	mutex_exit(_lock);
 
-	return (0);
+	return error;
 }
 

CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Fri Mar 31 23:50:01 UTC 2017

Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile

Log Message:
Disable stack-protector for bpf.c (sbin/dhcpcd)

This is temporary build fix.

Approved by 


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile

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

Modified files:

Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.35 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.36
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.35	Fri Mar 31 21:02:09 2017
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile	Fri Mar 31 23:50:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/03/31 21:02:09 roy Exp $
+# $NetBSD: Makefile,v 1.36 2017/03/31 23:50:01 kamil Exp $
 #
 
 WARNS?=		6
@@ -29,6 +29,7 @@ SRCS+=		auth.c hmac_md5.c
 .if (${USE_INET} != "no")
 CPPFLAGS+=	-DARP -DINET
 SRCS+=		arp.c bpf.c dhcp.c ipv4.c
+COPTS.bpf.c+=	-Wno-stack-protector
 .if !defined(SMALLPROG)
 CPPFLAGS+=	-DIPV4LL
 SRCS+=		ipv4ll.c

CVS commit: src/sys/ufs/lfs

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Fri Mar 31 23:00:21 UTC 2017

Modified Files:
src/sys/ufs/lfs: lfs_inode.c

Log Message:
stopgap fix- move lfs_lock to include calls to lfs_dino_{set,get}block

blocks new users that need seglock (need to take lfs_lock) that
setblock before the assert (truncate to 0 but 31 blks/31 effblks)

not proper, but lets me run firefox on lfs


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/ufs/lfs/lfs_inode.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/ufs/lfs/lfs_inode.c
diff -u src/sys/ufs/lfs/lfs_inode.c:1.153 src/sys/ufs/lfs/lfs_inode.c:1.154
--- src/sys/ufs/lfs/lfs_inode.c:1.153	Tue Mar 21 09:53:00 2017
+++ src/sys/ufs/lfs/lfs_inode.c	Fri Mar 31 23:00:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_inode.c,v 1.153 2017/03/21 09:53:00 maya Exp $	*/
+/*	$NetBSD: lfs_inode.c,v 1.154 2017/03/31 23:00:21 maya Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.153 2017/03/21 09:53:00 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.154 2017/03/31 23:00:21 maya Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -573,11 +573,11 @@ done:
 	oip->i_size = length;
 	lfs_dino_setsize(fs, oip->i_din, oip->i_size);
 	oip->i_lfs_effnblks -= blocksreleased;
+
+	mutex_enter(_lock);
 	lfs_dino_setblocks(fs, oip->i_din,
 	lfs_dino_getblocks(fs, oip->i_din) - real_released);
-	mutex_enter(_lock);
 	lfs_sb_addbfree(fs, blocksreleased);
-	mutex_exit(_lock);
 
 	KASSERTMSG((oip->i_size != 0 ||
 		lfs_dino_getblocks(fs, oip->i_din) == 0),
@@ -592,7 +592,6 @@ done:
 	/*
 	 * If we truncated to zero, take us off the paging queue.
 	 */
-	mutex_enter(_lock);
 	if (oip->i_size == 0 && oip->i_flags & IN_PAGING) {
 		oip->i_flags &= ~IN_PAGING;
 		TAILQ_REMOVE(>lfs_pchainhd, oip, i_lfs_pchain);

CVS commit: src/doc

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Mar 31 21:07:02 UTC 2017

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note import of dhcpcd-7.0.0-beta1


To generate a diff of this commit:
cvs rdiff -u -r1.1425 -r1.1426 src/doc/3RDPARTY
cvs rdiff -u -r1.2266 -r1.2267 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1425 src/doc/3RDPARTY:1.1426
--- src/doc/3RDPARTY:1.1425	Tue Mar 21 19:26:40 2017
+++ src/doc/3RDPARTY	Fri Mar 31 21:07:02 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1425 2017/03/21 19:26:40 kre Exp $
+#	$NetBSD: 3RDPARTY,v 1.1426 2017/03/31 21:07:02 roy Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -334,8 +334,8 @@ Notes:
 Use the dhcp2netbsd script.
 
 Package:	dhcpcd
-Version:	6.11.4
-Current Vers:	6.11.5 (not needed for NetBSD)
+Version:	7.0.0-beta1
+Current Vers:	7.0.0-beta1
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/
@@ -344,7 +344,6 @@ License:	BSD (2-clause)
 Location:	external/bsd/dhcpcd/dist
 Notes:
 Please submit all changes to the author.
-The distribution doesn't include the Linux specific bits or build system.
 
 Package:   drm
 Version:   Linux 3.15

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2266 src/doc/CHANGES:1.2267
--- src/doc/CHANGES:1.2266	Tue Mar 21 19:26:40 2017
+++ src/doc/CHANGES	Fri Mar 31 21:07:02 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2266 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2267 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -492,3 +492,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		adding support for all required operators, as well
 		as being smaller and faster.  [kre 20170320]
 	zoneinfo: Import tzdata2017b.  [kre 20170321]
+	dhcpcd(8): Import dhcpcd-7.0.0-beta1 [roy 20170331]

CVS commit: src/external/bsd/dhcpcd

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Mar 31 21:02:09 UTC 2017

Modified Files:
src/external/bsd/dhcpcd: Makefile
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Added Files:
src/external/bsd/dhcpcd: Makefile.inc
src/external/bsd/dhcpcd/include: config.h
src/external/bsd/dhcpcd/libexec: Makefile
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks: Makefile
src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks: Makefile

Log Message:
Adjust build glue for dhcpcd-7


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/dhcpcd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/dhcpcd/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/dhcpcd/include/config.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/dhcpcd/libexec/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile

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

Modified files:

Index: src/external/bsd/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/Makefile:1.1 src/external/bsd/dhcpcd/Makefile:1.2
--- src/external/bsd/dhcpcd/Makefile:1.1	Sun Jul 27 19:31:03 2008
+++ src/external/bsd/dhcpcd/Makefile	Fri Mar 31 21:02:08 2017
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2008/07/27 19:31:03 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2017/03/31 21:02:08 roy Exp $
 
-SUBDIR=		sbin
+SUBDIR=		sbin libexec
 
 .include 

Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.34 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.35
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.34	Fri Dec  2 02:41:54 2016
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile	Fri Mar 31 21:02:09 2017
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.34 2016/12/02 02:41:54 riastradh Exp $
+# $NetBSD: Makefile,v 1.35 2017/03/31 21:02:09 roy Exp $
 #
 
 WARNS?=		6
 USE_FORT?=	yes	# network client (local server)
 
 .include 
+.include "../../Makefile.inc"
 
 PROG=		dhcpcd
 SRCS=		common.c control.c dhcpcd.c duid.c eloop.c
-SRCS+=		if.c if-options.c script.c
+SRCS+=		if.c if-options.c route.c sa.c script.c
 SRCS+=		dhcp-common.c dhcpcd-embedded.c
 SRCS+=		if-bsd.c
 
@@ -26,8 +27,8 @@ SRCS+=		auth.c hmac_md5.c
 .endif
 
 .if (${USE_INET} != "no")
-CPPFLAGS+=	-DINET
-SRCS+=		arp.c dhcp.c ipv4.c
+CPPFLAGS+=	-DARP -DINET
+SRCS+=		arp.c bpf.c dhcp.c ipv4.c
 .if !defined(SMALLPROG)
 CPPFLAGS+=	-DIPV4LL
 SRCS+=		ipv4ll.c
@@ -43,42 +44,19 @@ CPPFLAGS+=	-DDHCP6
 SRCS+=		dhcp6.c
 .endif
 
-DIST=		${NETBSDSRCDIR}/external/bsd/dhcpcd/dist
-CPPFLAGS+=	-I${DIST} -I${.OBJDIR}
+CPPFLAGS+=	-I${SRCDIR}/include -I${DIST}/src -I${.OBJDIR}
 
 DPADD+=		${LIBUTIL}
 LDADD+=		-lutil
 
-.PATH: ${DIST} ${DIST}/crypt ${LIBC_NET}
-
-SCRIPTS=			dhcpcd-run-hooks
-SCRIPTSDIR_dhcpcd-run-hooks=	/libexec
+.PATH: ${DIST}/src ${DIST}/src/crypt ${LIBC_NET}
 
 CONFIGFILES=			dhcpcd.conf
 FILESDIR_dhcpcd.conf=		/etc
 FILESMODE_dhcpcd.conf=		644	# -rw-r--r--
 
-HOOKS=			01-test 02-dump 20-resolv.conf 30-hostname
-HOOKS+=			50-ntp.conf
-
-FILES=			${HOOKS:C,^,${DIST}/dhcpcd-hooks/,}
-FILESDIR=		/libexec/dhcpcd-hooks
-
-EGHOOKS=		10-wpa_supplicant 15-timezone 29-lookup-hostname
-EGHOOKS+=		50-ypbind
-
-.if ${MKSHARE} != "no"
-EGFILES=		${EGHOOKS:C,^,${DIST}/dhcpcd-hooks/,}
-FILES+=			${EGFILES}
-.for f in ${EGFILES}
-FILESDIR_${f}=		/usr/share/examples/dhcpcd/hooks
-.endfor
-.endif
-
-MAN=			dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
-
-CLEANFILES=		dhcpcd.conf.5 dhcpcd.8 \
-			dhcpcd-run-hooks dhcpcd-run-hooks.8
+MAN=			dhcpcd.conf.5 dhcpcd.8 
+CLEANFILES=		dhcpcd.conf.5 dhcpcd.8 
 
 dhcpcd-embedded.h:	genembedh ${DHCPCD_DEFS} dhcpcd-embedded.h.in
 	${HOST_SH} ${.ALLSRC} $^ > $@
@@ -90,18 +68,9 @@ if-options.c:		dhcpcd-embedded.h
 
 CLEANFILES+=		dhcpcd-embedded.c dhcpcd-embedded.h
 
-.for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
+.for f in dhcpcd.conf.5 dhcpcd.8
 ${f}:	${f}.in
-	${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \
-	-e 's:@LIBDIR@:/lib:g' \
-	-e 's:@RUNDIR@:/var/run:g' \
-	-e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
-	-e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
-	-e 's:@SERVICEEXISTS@::g' \
-	-e 's:@SERVICECMD@::g' \
-	-e 's:@SERVICESTATUS@::g' \
-	-e 's:@STATUSARG@::g' \
-	${DIST}/${f}.in > $@
+	${TOOL_SED} ${SED_SYS} ${DIST}/src/${f}.in > $@
 .endfor
 
 # XXXGCC5

Added files:

Index: src/external/bsd/dhcpcd/Makefile.inc
diff -u /dev/null src/external/bsd/dhcpcd/Makefile.inc:1.1
--- /dev/null	Fri Mar 31 21:02:09 2017
+++ src/external/bsd/dhcpcd/Makefile.inc	Fri Mar 31 21:02:08 2017
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile.inc,v 1.1 2017/03/31 21:02:08 roy Exp $
+
+SRCDIR=		${NETBSDSRCDIR}/external/bsd/dhcpcd
+DIST=		${SRCDIR}/dist
+
+SED_SYS=	-e 's:@SYSCONFDIR@:/etc:g' \
+		

CVS commit: src/external/bsd/dhcpcd/dist

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Mar 31 20:53:56 UTC 2017

Added Files:
src/external/bsd/dhcpcd/dist: .gitignore
Removed Files:
src/external/bsd/dhcpcd/dist: arp.c arp.h auth.h bpf-filter.h common.c
common.h config.h control.c control.h defs.h dev.h dhcp-common.c
dhcp-common.h dhcp.c dhcp.h dhcp6.c dhcp6.h
dhcpcd-definitions-small.conf dhcpcd-definitions.conf
dhcpcd-embedded.c.in dhcpcd-embedded.h.in dhcpcd-run-hooks.8.in
dhcpcd-run-hooks.in dhcpcd.8.in dhcpcd.c dhcpcd.conf
dhcpcd.conf.5.in dhcpcd.h duid.c duid.h eloop.c eloop.h genembedc
genembedh if-bsd.c if-options.c if-options.h if.c if.h ipv4.c
ipv4.h ipv4ll.c ipv4ll.h ipv6.c ipv6.h ipv6nd.c ipv6nd.h script.c
script.h
src/external/bsd/dhcpcd/dist/crypt: crypt.h hmac_md5.c
src/external/bsd/dhcpcd/dist/dhcpcd-hooks: 01-test 02-dump
10-wpa_supplicant 15-timezone 20-resolv.conf 29-lookup-hostname
30-hostname 50-ntp.conf 50-ypbind

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/external/bsd/dhcpcd/dist/.gitignore
cvs rdiff -u -r1.22 -r0 src/external/bsd/dhcpcd/dist/arp.c \
src/external/bsd/dhcpcd/dist/ipv6.c
cvs rdiff -u -r1.14 -r0 src/external/bsd/dhcpcd/dist/arp.h
cvs rdiff -u -r1.10 -r0 src/external/bsd/dhcpcd/dist/auth.h \
src/external/bsd/dhcpcd/dist/eloop.h
cvs rdiff -u -r1.11 -r0 src/external/bsd/dhcpcd/dist/bpf-filter.h
cvs rdiff -u -r1.21 -r0 src/external/bsd/dhcpcd/dist/common.c \
src/external/bsd/dhcpcd/dist/ipv6.h
cvs rdiff -u -r1.15 -r0 src/external/bsd/dhcpcd/dist/common.h \
src/external/bsd/dhcpcd/dist/eloop.c \
src/external/bsd/dhcpcd/dist/ipv6nd.h
cvs rdiff -u -r1.12 -r0 src/external/bsd/dhcpcd/dist/config.h \
src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf \
src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
cvs rdiff -u -r1.13 -r0 src/external/bsd/dhcpcd/dist/control.c \
src/external/bsd/dhcpcd/dist/dhcp-common.h \
src/external/bsd/dhcpcd/dist/duid.c src/external/bsd/dhcpcd/dist/ipv4ll.h
cvs rdiff -u -r1.8 -r0 src/external/bsd/dhcpcd/dist/control.h
cvs rdiff -u -r1.31 -r0 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.7 -r0 src/external/bsd/dhcpcd/dist/dev.h \
src/external/bsd/dhcpcd/dist/duid.h src/external/bsd/dhcpcd/dist/script.h
cvs rdiff -u -r1.19 -r0 src/external/bsd/dhcpcd/dist/dhcp-common.c \
src/external/bsd/dhcpcd/dist/if.h src/external/bsd/dhcpcd/dist/ipv4ll.c
cvs rdiff -u -r1.47 -r0 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.17 -r0 src/external/bsd/dhcpcd/dist/dhcp.h \
src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
cvs rdiff -u -r1.26 -r0 src/external/bsd/dhcpcd/dist/dhcp6.c \
src/external/bsd/dhcpcd/dist/ipv4.c
cvs rdiff -u -r1.16 -r0 src/external/bsd/dhcpcd/dist/dhcp6.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/dhcpcd/dist/dhcpcd-definitions-small.conf \
src/external/bsd/dhcpcd/dist/genembedc \
src/external/bsd/dhcpcd/dist/genembedh
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in
cvs rdiff -u -r1.51 -r0 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.37 -r0 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.18 -r0 src/external/bsd/dhcpcd/dist/dhcpcd.conf
cvs rdiff -u -r1.30 -r0 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
cvs rdiff -u -r1.20 -r0 src/external/bsd/dhcpcd/dist/dhcpcd.h \
src/external/bsd/dhcpcd/dist/if-options.h \
src/external/bsd/dhcpcd/dist/ipv4.h
cvs rdiff -u -r1.34 -r0 src/external/bsd/dhcpcd/dist/if-bsd.c \
src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.36 -r0 src/external/bsd/dhcpcd/dist/if-options.c
cvs rdiff -u -r1.24 -r0 src/external/bsd/dhcpcd/dist/if.c
cvs rdiff -u -r1.28 -r0 src/external/bsd/dhcpcd/dist/script.c
cvs rdiff -u -r1.6 -r0 src/external/bsd/dhcpcd/dist/crypt/crypt.h
cvs rdiff -u -r1.8 -r0 src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
cvs rdiff -u -r1.8 -r0 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
cvs rdiff -u -r1.6 -r0 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
cvs rdiff -u -r1.10 -r0 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
cvs rdiff -u -r1.7 -r0 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind

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

Added files:

Index: src/external/bsd/dhcpcd/dist/.gitignore
diff -u /dev/null src/external/bsd/dhcpcd/dist/.gitignore:1.3
--- /dev/null	Fri Mar 31 20:53:56 2017
+++ 

CVS import: src/external/bsd/dhcpcd/dist

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Fri Mar 31 20:51:16 UTC 2017

Update of /cvsroot/src/external/bsd/dhcpcd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv22545

Log Message:
Import dhcpcd-7.0.0-beta. Changes from prior version include:

  *  source file locations reworked:
   dhcpcd source is in src
   dhcpcd hooks are in hooks
   compat is in compat
  *  README split into README.md and BUILDING.md
  *  internal routing is now protocol agnostic
  *  avoid using __packed and use compile time asserts instead
  *  addresses some alignment issues
  *  disable some ARP code on kernels which support RFC5227
  *  BSD IPv6 kernel settings are now updated to reflect dhcpcd config
  *  custom logger has been removed, syslog handles everything
 as such, the --logfile option has been removed as well.
 If you need better/earlier logging, get a better syslogger!
  *  distinfo and signed distinfo files are now available alongside
 release taraballs from this point onwards
  *  default DBDIR has changed from /var/db to /var/db/dhcpcd
  *  /etc/dhcpcd.duid moves to DBDIR/duid
  *  /etc/dhcpcd.secret moves to DBDIR/secret
  *  lease file names have dhcpcd removed from them as they are now
 inside a directory of the same name
  *  fixed issues with reject routes not working on some platforms
  *  improved nl80211 support on Linux for working out the SSID
  *  no longer request NTP by default in dhcpcd.conf
  *  BPF filtering vastly improved so dhcpcd only wake up on
 ARP or DHCP packets destined for it
  *  support for MUD URL (draft-ietf-opsawg-mud-05)
  *  if the kernel isn't doing DAD, don't insist on waiting for it
 to actually do it
  *  fix a potential crash where the DHCP or ARP states could be
 freed before the packet processing loop naturally breaks
  *  removed gateway and nogateway options
 (these can be controlled by the nooption directive which
 works for more than just gateways)
  *  removed ipv6ra_own and ipv6ra_own_default options
 (these can be controled by the ipv6rs/noipv6rs directive)
  *  fix a crash receiving SIGUSR1


Status:

Vendor Tag: roy
Release Tags:   dhcpcd-7-0-0-beta1

N src/external/bsd/dhcpcd/dist/.arcconfig
C src/external/bsd/dhcpcd/dist/.gitignore
N src/external/bsd/dhcpcd/dist/BUILDING.md
N src/external/bsd/dhcpcd/dist/LICENSE
N src/external/bsd/dhcpcd/dist/Makefile
N src/external/bsd/dhcpcd/dist/Makefile.inc
N src/external/bsd/dhcpcd/dist/README.md
N src/external/bsd/dhcpcd/dist/config-null.mk
N src/external/bsd/dhcpcd/dist/configure
N src/external/bsd/dhcpcd/dist/iconfig.mk
N src/external/bsd/dhcpcd/dist/compat/_strtoi.h
N src/external/bsd/dhcpcd/dist/compat/arc4random.c
N src/external/bsd/dhcpcd/dist/compat/arc4random.h
N src/external/bsd/dhcpcd/dist/compat/bitops.h
N src/external/bsd/dhcpcd/dist/compat/queue.h
N src/external/bsd/dhcpcd/dist/compat/arc4random_uniform.c
N src/external/bsd/dhcpcd/dist/compat/arc4random_uniform.h
N src/external/bsd/dhcpcd/dist/compat/reallocarray.c
N src/external/bsd/dhcpcd/dist/compat/dprintf.c
N src/external/bsd/dhcpcd/dist/compat/dprintf.h
N src/external/bsd/dhcpcd/dist/compat/endian.h
N src/external/bsd/dhcpcd/dist/compat/pidfile.c
N src/external/bsd/dhcpcd/dist/compat/pidfile.h
N src/external/bsd/dhcpcd/dist/compat/reallocarray.h
N src/external/bsd/dhcpcd/dist/compat/strtoi.c
N src/external/bsd/dhcpcd/dist/compat/strtoi.h
N src/external/bsd/dhcpcd/dist/compat/strtou.c
N src/external/bsd/dhcpcd/dist/compat/crypt/md5.c
N src/external/bsd/dhcpcd/dist/compat/crypt/md5.h
N src/external/bsd/dhcpcd/dist/compat/crypt/sha256.c
N src/external/bsd/dhcpcd/dist/compat/crypt/sha256.h
N src/external/bsd/dhcpcd/dist/src/GNUmakefile
N src/external/bsd/dhcpcd/dist/src/Makefile
N src/external/bsd/dhcpcd/dist/src/arp.c
N src/external/bsd/dhcpcd/dist/src/arp.h
N src/external/bsd/dhcpcd/dist/src/auth.c
N src/external/bsd/dhcpcd/dist/src/auth.h
N src/external/bsd/dhcpcd/dist/src/bpf.c
N src/external/bsd/dhcpcd/dist/src/bpf.h
N src/external/bsd/dhcpcd/dist/src/common.c
N src/external/bsd/dhcpcd/dist/src/common.h
N src/external/bsd/dhcpcd/dist/src/control.c
N src/external/bsd/dhcpcd/dist/src/control.h
N src/external/bsd/dhcpcd/dist/src/dhcp-common.c
N src/external/bsd/dhcpcd/dist/src/defs.h
N src/external/bsd/dhcpcd/dist/src/dev.c
N src/external/bsd/dhcpcd/dist/src/dev.h
N src/external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf
N src/external/bsd/dhcpcd/dist/src/dhcp-common.h
N src/external/bsd/dhcpcd/dist/src/dhcp.c
N src/external/bsd/dhcpcd/dist/src/dhcp.h
N src/external/bsd/dhcpcd/dist/src/dhcp6.c
N src/external/bsd/dhcpcd/dist/src/dhcp6.h
N src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in
N src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in
N src/external/bsd/dhcpcd/dist/src/dhcpcd-definitions-small.conf
N src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in
N src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in
N src/external/bsd/dhcpcd/dist/src/dhcpcd.c
N 

CVS commit: [netbsd-7-nhusb] src/share/man/man4

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 18:21:08 UTC 2017

Modified Files:
src/share/man/man4 [netbsd-7-nhusb]: axe.4 axen.4 cdce.4 uaudio.4
ucom.4 uep.4 urtw.4 usb.4 uyap.4
Added Files:
src/share/man/man4 [netbsd-7-nhusb]: xhci.4

Log Message:
Update usb related man pages


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.30.1 src/share/man/man4/axe.4
cvs rdiff -u -r1.2 -r1.2.12.1 src/share/man/man4/axen.4
cvs rdiff -u -r1.10 -r1.10.8.1 src/share/man/man4/cdce.4
cvs rdiff -u -r1.25 -r1.25.24.1 src/share/man/man4/uaudio.4
cvs rdiff -u -r1.25 -r1.25.8.1 src/share/man/man4/ucom.4
cvs rdiff -u -r1.6 -r1.6.48.1 src/share/man/man4/uep.4
cvs rdiff -u -r1.4 -r1.4.8.1 src/share/man/man4/urtw.4
cvs rdiff -u -r1.104 -r1.104.10.1 src/share/man/man4/usb.4
cvs rdiff -u -r1.3 -r1.3.48.1 src/share/man/man4/uyap.4
cvs rdiff -u -r0 -r1.2.4.2 src/share/man/man4/xhci.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/axe.4
diff -u src/share/man/man4/axe.4:1.8 src/share/man/man4/axe.4:1.8.30.1
--- src/share/man/man4/axe.4:1.8	Wed Jun 23 21:03:16 2010
+++ src/share/man/man4/axe.4	Fri Mar 31 18:21:07 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: axe.4,v 1.8 2010/06/23 21:03:16 wiz Exp $
+.\" $NetBSD: axe.4,v 1.8.30.1 2017/03/31 18:21:07 skrll Exp $
 .\"
 .\" Copyright (c) 2003-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -60,7 +60,7 @@
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/axe.4,v 1.3 2003/05/29 21:28:35 ru Exp $
 .\" $OpenBSD: axe.4,v 1.37 2009/11/08 20:25:29 jasper Exp $
 .\"
-.Dd June 23, 2010
+.Dd December 19, 2016
 .Dt AXE 4
 .Os
 .Sh NAME
@@ -81,6 +81,7 @@ driver supports the following adapters:
 .It Billionton Systems USB2AR
 .It Buffalo(MELCO) LUA-U2-GT
 .It Buffalo(MELCO) LUA-U2-KTX
+.It Buffalo(MELCO) LUA3-U2-ATX
 .It Corega FEther USB2-TX
 .It D-Link DUB-E100
 .It Good Way GWUSB2E
@@ -93,9 +94,12 @@ driver supports the following adapters:
 .It Linksys USB200M
 .It Linksys USB1000
 .It Logitec LAN-GTJ/U2
+.It Logitec LAN-TXU2C
+.It Logitec LAN-TXU2H3A
 .It Netgear FA120
 .It Nintendo Wii USB Lan Ethernet Adapter RVL-015
 .It OQO model 01+ Ethernet
+.It Planex UE-200TX-G
 .It Sitecom LN-029
 .It SMC 2209USB/ETH
 .It SnapPort USB 2.0 LAN Adapter
@@ -110,16 +114,16 @@ The
 .Nm
 driver provides support for USB
 .Tn Ethernet
-adapters based on the ASIX Electronics AX88172, AX88178, and AX88772
-USB 2.0 chipsets.
+adapters based on the ASIX Electronics AX88172, AX88178, AX88772, AX88772A,
+AX88772B USB 2.0 chipsets.
 .Pp
 The chip contains a 10/100
 .Tn Ethernet
 MAC with MII interface and is designed to work with both
 .Tn Ethernet
 and HomePNA transceivers.
-The AX8172 and AX88772 contain 10/100 Ethernet MACs with MII interfaces.
-The AX8178 contains a 10/100/1000 Gigabit
+The AX88172 and AX88772 contain 10/100 Ethernet MACs with MII interfaces.
+The AX88178 contains a 10/100/1000 Gigabit
 .Tn Ethernet
 MAC with a GMII/MII interface.
 The chip also supports USB 2.0, thereby accommodating 100 Mb/s data rates.

Index: src/share/man/man4/axen.4
diff -u src/share/man/man4/axen.4:1.2 src/share/man/man4/axen.4:1.2.12.1
--- src/share/man/man4/axen.4:1.2	Sun Oct 27 11:41:38 2013
+++ src/share/man/man4/axen.4	Fri Mar 31 18:21:07 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: axen.4,v 1.2 2013/10/27 11:41:38 wiz Exp $
+.\"	$NetBSD: axen.4,v 1.2.12.1 2017/03/31 18:21:07 skrll Exp $
 .\"	$OpenBSD: axen.4,v 1.2 2013/10/07 07:18:36 jmc Exp $
 .\"
 .\" Copyright (c) 2013 Yojiro UO 
@@ -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 26, 2013
+.Dd April 21, 2015
 .Dt AXEN 4
 .Os
 .Sh NAME
@@ -34,8 +34,11 @@ Electronics AX88178a and AX88779 USB 2.0
 including the following:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
+.It Buffalo LUA4-U3-AGT
 .It Kurotoshiko GbE-USB3.0
+.It Kurotoshiko GbE-USB3.0S2
 .It Logitec LAN-GTJU3
+.It Logitec LAN-GTJU3H3
 .It Shanghai Donya DN-84327
 .El
 .Pp

Index: src/share/man/man4/cdce.4
diff -u src/share/man/man4/cdce.4:1.10 src/share/man/man4/cdce.4:1.10.8.1
--- src/share/man/man4/cdce.4:1.10	Tue Mar 18 18:20:39 2014
+++ src/share/man/man4/cdce.4	Fri Mar 31 18:21:07 2017
@@ -25,9 +25,9 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $NetBSD: cdce.4,v 1.10 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: cdce.4,v 1.10.8.1 2017/03/31 18:21:07 skrll Exp $
 .\"
-.Dd June 7, 2011
+.Dd December 19, 2016
 .Dt CDCE 4
 .Os
 .Sh NAME
@@ -39,13 +39,18 @@
 The
 .Nm
 driver provides support for USB Host-to-Host (aka USB-to-USB) bridges
-based on the USB Communication Device Class (CDC) and Ethernet subclass,
+and USB-to-Ethernet adapters based on the USB Communication Device Class (CDC)
+and Ethernet subclass,
 including the 

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:30:58 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: uep.c


To generate a diff of this commit:
cvs rdiff -u -r1.19.10.1 -r1.19.10.2 src/sys/dev/usb/uep.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/uep.c
diff -u src/sys/dev/usb/uep.c:1.19.10.1 src/sys/dev/usb/uep.c:1.19.10.2
--- src/sys/dev/usb/uep.c:1.19.10.1	Tue Sep  6 20:33:09 2016
+++ src/sys/dev/usb/uep.c	Fri Mar 31 10:30:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uep.c,v 1.19.10.1 2016/09/06 20:33:09 skrll Exp $	*/
+/*	$NetBSD: uep.c,v 1.19.10.2 2017/03/31 10:30:58 skrll Exp $	*/
 
 /*
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  *  eGalax USB touchpanel controller driver.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.19.10.1 2016/09/06 20:33:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.19.10.2 2017/03/31 10:30:58 skrll Exp $");
 
 #include 
 #include 
@@ -54,6 +54,14 @@ __KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.19
 #include 
 
 #define UIDSTR	"eGalax USB SN00"
+/* calibration - integer values, perhaps sysctls?  */
+#define X_RATIO   293 
+#define X_OFFSET  -28
+#define Y_RATIO   -348
+#define Y_OFFSET  537
+/* an X_RATIO of ``312''  means : reduce by a factor 3.12 x axis amplitude */
+/* an Y_RATIO of ``-157'' means : reduce by a factor 1.57 y axis amplitude,
+ * and reverse y motion */
 
 struct uep_softc {
 	device_t sc_dev;
@@ -358,6 +366,17 @@ uep_ioctl(void *v, u_long cmd, void *dat
 	return EPASSTHROUGH;
 }
 
+static int
+uep_adjust(int v, int off, int rat)
+{
+	int num = 100 * v;
+	int quot = num / rat;
+	int rem = num % rat;
+	if (num >= 0 && rem < 0)
+		quot++;
+	return quot + off;
+}
+
 void
 uep_intr(struct usbd_xfer *xfer, void *addr, usbd_status status)
 {
@@ -429,8 +448,8 @@ uep_intr(struct usbd_xfer *xfer, void *a
 		default:
 			msk = 0x0f;	/* H=0, L=0 */
 		}
-		x = ((p[3] & msk) << 7) | p[4];
-		y = ((p[1] & msk) << 7) | p[2];
+		x = uep_adjust(((p[3] & msk) << 7) | p[4], X_OFFSET, X_RATIO);
+		y = uep_adjust(((p[1] & msk) << 7) | p[2], Y_OFFSET, Y_RATIO);
 
 		tpcalib_trans(>sc_tpcalib, x, y, , );
 

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:28:21 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: if_axe.c

Log Message:
Fix build


To generate a diff of this commit:
cvs rdiff -u -r1.67.8.2 -r1.67.8.3 src/sys/dev/usb/if_axe.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_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.67.8.2 src/sys/dev/usb/if_axe.c:1.67.8.3
--- src/sys/dev/usb/if_axe.c:1.67.8.2	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/if_axe.c	Fri Mar 31 10:28:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axe.c,v 1.67.8.2 2017/01/26 21:54:24 skrll Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.67.8.3 2017/03/31 10:28:21 skrll Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
 
 /*
@@ -87,7 +87,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.8.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.8.3 2017/03/31 10:28:21 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -278,6 +278,8 @@ static void	axe_unlock_mii(struct axe_so
 
 static void	axe_ax88178_init(struct axe_softc *);
 static void	axe_ax88772_init(struct axe_softc *);
+static void	axe_ax88772a_init(struct axe_softc *);
+static void	axe_ax88772b_init(struct axe_softc *);
 
 /* Get exclusive access to the MII registers */
 static void

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:25:55 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: uftdi.c

Log Message:
revision 1.64
allow suspend with uftdi(4). it works fine.


To generate a diff of this commit:
cvs rdiff -u -r1.59.4.1.4.2 -r1.59.4.1.4.3 src/sys/dev/usb/uftdi.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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.59.4.1.4.2 src/sys/dev/usb/uftdi.c:1.59.4.1.4.3
--- src/sys/dev/usb/uftdi.c:1.59.4.1.4.2	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/uftdi.c	Fri Mar 31 10:25:55 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uftdi.c,v 1.59.4.1.4.2 2017/01/26 21:54:24 skrll Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.59.4.1.4.3 2017/03/31 10:25:55 skrll Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.4.1.4.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.4.1.4.3 2017/03/31 10:25:55 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -341,6 +341,9 @@ uftdi_attach(device_t parent, device_t s
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
 
+	if (!pmf_device_register(self, NULL, NULL))
+		aprint_error_dev(self, "couldn't establish power handler\n");
+
 	return;
 
 bad:

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:14:06 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: uhso.c

Log Message:
revision 1.25
fix off by one


To generate a diff of this commit:
cvs rdiff -u -r1.16.6.3 -r1.16.6.4 src/sys/dev/usb/uhso.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/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.16.6.3 src/sys/dev/usb/uhso.c:1.16.6.4
--- src/sys/dev/usb/uhso.c:1.16.6.3	Fri Mar 31 09:38:05 2017
+++ src/sys/dev/usb/uhso.c	Fri Mar 31 10:14:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhso.c,v 1.16.6.3 2017/03/31 09:38:05 skrll Exp $	*/
+/*	$NetBSD: uhso.c,v 1.16.6.4 2017/03/31 10:14:06 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.16.6.3 2017/03/31 09:38:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.16.6.4 2017/03/31 10:14:06 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -641,14 +641,14 @@ uhso_get_iface_spec(struct usb_attach_ar
 
 	switch (hd->type) {
 	case UHSOTYPE_DEFAULT:
-		if (ifnum > __arraycount(uhso_spec_default))
+		if (ifnum >= __arraycount(uhso_spec_default))
 			break;
 
 		*spec = uhso_spec_default[ifnum];
 		return 1;
 
 	case UHSOTYPE_ICON321:
-		if (ifnum > __arraycount(uhso_spec_icon321))
+		if (ifnum >= __arraycount(uhso_spec_icon321))
 			break;
 
 		*spec = uhso_spec_icon321[ifnum];
@@ -665,8 +665,8 @@ uhso_get_iface_spec(struct usb_attach_ar
 		if (status != USBD_NORMAL_COMPLETION)
 			break;
 
-		if (ifnum > __arraycount(config)
-		|| config[ifnum] > __arraycount(uhso_spec_config))
+		if (ifnum >= __arraycount(config)
+		|| config[ifnum] >= __arraycount(uhso_spec_config))
 			break;
 
 		*spec = uhso_spec_config[config[ifnum]];

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:13:09 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: ukbd.c

Log Message:
revision 1.136
don't memcpy overlapping buffers, use memmove.
this is undefined behaviour.
CID 1299069

revision 1.135
kassert that we aren't overflowing the array.

this assert isn't expected to trigger due to current parameters used, but
to be sure, check.


To generate a diff of this commit:
cvs rdiff -u -r1.129.4.1.4.2 -r1.129.4.1.4.3 src/sys/dev/usb/ukbd.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/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.129.4.1.4.2 src/sys/dev/usb/ukbd.c:1.129.4.1.4.3
--- src/sys/dev/usb/ukbd.c:1.129.4.1.4.2	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/ukbd.c	Fri Mar 31 10:13:09 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: ukbd.c,v 1.129.4.1.4.2 2017/01/26 21:54:24 skrll Exp $*/
+/*  $NetBSD: ukbd.c,v 1.129.4.1.4.3 2017/03/31 10:13:09 skrll Exp $*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.129.4.1.4.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.129.4.1.4.3 2017/03/31 10:13:09 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -719,7 +719,10 @@ ukbd_decode(struct ukbd_softc *sc, struc
 	int s;
 	int nkeys, i, j;
 	int key;
-#define ADDKEY(c) ibuf[nkeys++] = (c)
+#define ADDKEY(c) do { \
+KASSERT(nkeys < MAXKEYS); \
+ibuf[nkeys++] = (c); \
+} while (0)
 
 #ifdef UKBD_DEBUG
 	/*
@@ -1001,7 +1004,7 @@ ukbd_cngetc(void *v, u_int *type, int *d
 	sc->sc_flags &= ~FLAG_POLLING;
 	c = sc->sc_pollchars[0];
 	sc->sc_npollchar--;
-	memcpy(sc->sc_pollchars, sc->sc_pollchars+1,
+	memmove(sc->sc_pollchars, sc->sc_pollchars+1,
 	   sc->sc_npollchar * sizeof(uint16_t));
 	*type = c & RELEASE ? WSCONS_EVENT_KEY_UP : WSCONS_EVENT_KEY_DOWN;
 	*data = c & CODEMASK;

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:05:07 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: if_urtwn_data.h motg.c uberry.c
ugen.c uipad.c uplcom.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/sys/dev/usb/if_urtwn_data.h
cvs rdiff -u -r1.6.4.2.4.2 -r1.6.4.2.4.3 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.9.18.3 -r1.9.18.4 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.124.2.2.2.2 -r1.124.2.2.2.3 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.1.32.2 -r1.1.32.3 src/sys/dev/usb/uipad.c
cvs rdiff -u -r1.74.2.2.2.2 -r1.74.2.2.2.3 src/sys/dev/usb/uplcom.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_data.h
diff -u src/sys/dev/usb/if_urtwn_data.h:1.3.10.1 src/sys/dev/usb/if_urtwn_data.h:1.3.10.2
--- src/sys/dev/usb/if_urtwn_data.h:1.3.10.1	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/if_urtwn_data.h	Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urtwn_data.h,v 1.3.10.1 2017/01/26 21:54:24 skrll Exp $	*/
+/*	$NetBSD: if_urtwn_data.h,v 1.3.10.2 2017/03/31 10:05:07 skrll Exp $	*/
 /*	$OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $	*/
 
 /*-
@@ -50,7 +50,7 @@ static const struct {
 	{ 0x640, 0x40 }, { 0x642, 0x40 }, { 0x643, 0x00 }, { 0x652, 0xc8 },
 	{ 0x66e, 0x05 }, { 0x700, 0x21 }, { 0x701, 0x43 }, { 0x702, 0x65 },
 	{ 0x703, 0x87 }, { 0x708, 0x21 }, { 0x709, 0x43 }, { 0x70a, 0x65 },
-	{ 0x70b, 0x87 },
+	{ 0x70b, 0x87 }, 
 }, rtl8188eu_mac[] = {
 	{ 0x026, 0x41 }, { 0x027, 0x35 }, { 0x040, 0x00 }, { 0x428, 0x0a },
 	{ 0x429, 0x10 }, { 0x430, 0x00 }, { 0x431, 0x01 }, { 0x432, 0x02 },
@@ -548,7 +548,7 @@ static const uint16_t rtl8192eu_bb_regs[
 	0xe38, 0xe3c, 0xe40, 0xe44, 0xe48, 0xe4c, 0xe50, 0xe54,
 	0xe58, 0xe5c, 0xe60, 0xe68, 0xe6c, 0xe70, 0xe74, 0xe78,
 	0xe7c, 0xe80, 0xe84, 0xe88, 0xe8c, 0xed0, 0xed4, 0xed8,
-	0xedc, 0xee0, 0xeec, 0xee4, 0xee8, 0xf14, 0xf4c, 0xf00,
+	0xedc, 0xee0, 0xeec, 0xee4, 0xee8, 0xf14, 0xf4c, 0xf00, 
 };
 
 static const uint32_t rtl8192eu_bb_vals[] = {
@@ -910,7 +910,7 @@ static const uint8_t rtl8192eu_rf_regs[]
 	0x34, 0x34, 0x34, 0x34, 0x34, 0x00, 0x84, 0x86, 0x87, 0x8e,
 	0x8f, 0xef, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
 	0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-	0xef, 0xfe, 0x18, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00,
+	0xef, 0xfe, 0x18, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00, 
 };
 
 static const uint32_t rtl8192eu_rf_vals[] = {
@@ -929,7 +929,7 @@ static const uint32_t rtl8192eu_rf_vals[
 	0xef7b0, 0xd4fb0, 0xcf060, 0xb0090, 0xa0080, 0x90080, 0x8f780,
 	0x787b0, 0x78730, 0x60fb0, 0x5ffa0, 0x40620, 0x37090, 0x20080,
 	0x1f060, 0x0ffb0, 0x000a0, 0x0, 0x0fc07, 0x0, 0x0,
-	0x0, 0x0, 0x1, 0x8, 0x33e70,
+	0x0, 0x0, 0x1, 0x8, 0x33e70, 
 };
 
 static const uint8_t rtl8192eu_rf2_regs[] = {
@@ -941,7 +941,7 @@ static const uint8_t rtl8192eu_rf2_regs[
 	0x34, 0x34, 0x34, 0x34, 0x34, 0x34, 0x00, 0x84, 0x86, 0x87,
 	0x8e, 0x8f, 0xef, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
 	0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-	0x3b, 0xef, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00,
+	0x3b, 0xef, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00, 
 };
 
 static const uint32_t rtl8192eu_rf2_vals[] = {
@@ -957,7 +957,7 @@ static const uint32_t rtl8192eu_rf2_vals
 	0xf07b0, 0xf02b0, 0xef7b0, 0xd4fb0, 0xcf060, 0xb0090, 0xa0080,
 	0x90080, 0x8f780, 0x787b0, 0x78730, 0x60fb0, 0x5ffa0, 0x40620,
 	0x37090, 0x20080, 0x1f060, 0x0ffb0, 0x000a0, 0x10159, 0x0,
-	0x0, 0x0, 0x0, 0x1, 0x8, 0x33e70,
+	0x0, 0x0, 0x0, 0x1, 0x8, 0x33e70, 
 };
 
 static const struct urtwn_rf_prog rtl8192eu_rf_prog[] = {

Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.6.4.2.4.2 src/sys/dev/usb/motg.c:1.6.4.2.4.3
--- src/sys/dev/usb/motg.c:1.6.4.2.4.2	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/motg.c	Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: motg.c,v 1.6.4.2.4.2 2017/01/26 21:54:24 skrll Exp $	*/
+/*	$NetBSD: motg.c,v 1.6.4.2.4.3 2017/03/31 10:05:07 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.2.4.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.2.4.3 2017/03/31 10:05:07 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_motg.h"
@@ -2087,7 +2087,7 @@ motg_device_intr_tx(struct motg_softc *s
 complete:
 	DPRINTFN(MD_BULK, "xfer %p complete, status %d", xfer,
 	(xfer != NULL) ? xfer->ux_status : 0, 0, 0);
-	KASSERTMSG(xfer && xfer->ux_status == USBD_IN_PROGRESS &&
+	KASSERTMSG(xfer && xfer->ux_status == USBD_IN_PROGRESS && 
 	ep->phase == DATA_OUT, "xfer %p status %d phase %d",
 	xfer, xfer->ux_status, ep->phase);
 	ep->phase = IDLE;

Index: 

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:01:43 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: ulpt.c

Log Message:
Fix up comments


To generate a diff of this commit:
cvs rdiff -u -r1.95.8.2 -r1.95.8.3 src/sys/dev/usb/ulpt.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/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.95.8.2 src/sys/dev/usb/ulpt.c:1.95.8.3
--- src/sys/dev/usb/ulpt.c:1.95.8.2	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/ulpt.c	Fri Mar 31 10:01:43 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulpt.c,v 1.95.8.2 2017/01/26 21:54:24 skrll Exp $	*/
+/*	$NetBSD: ulpt.c,v 1.95.8.3 2017/03/31 10:01:43 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.8.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.8.3 2017/03/31 10:01:43 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -704,7 +704,7 @@ ulpt_do_read(struct ulpt_softc *sc, stru
 		}
 
 		/*
-		 * XXX Even with the short timeout, this will tsleep,
+		 * XXX Even with the short timeout, this will sleep,
 		 * but it should be adequately prompt in practice.
 		 */
 		n = nreq;
@@ -748,7 +748,7 @@ ulpt_do_read(struct ulpt_softc *sc, stru
 
 		case USBD_INTERRUPTED:
 			/*
-			 * The tsleep in usbd_bulk_transfer was
+			 * The sleep in usbd_bulk_transfer was
 			 * interrupted.  Reflect it to the caller so
 			 * that reading can be interrupted.
 			 */

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 10:00:15 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: uthum.c uvscom.c uyurex.c

Log Message:
Convert tsleep to kpause


To generate a diff of this commit:
cvs rdiff -u -r1.10.18.2 -r1.10.18.3 src/sys/dev/usb/uthum.c
cvs rdiff -u -r1.28.20.2 -r1.28.20.3 src/sys/dev/usb/uvscom.c
cvs rdiff -u -r1.9.12.1.4.3 -r1.9.12.1.4.4 src/sys/dev/usb/uyurex.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/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.10.18.2 src/sys/dev/usb/uthum.c:1.10.18.3
--- src/sys/dev/usb/uthum.c:1.10.18.2	Thu Jan 26 21:54:25 2017
+++ src/sys/dev/usb/uthum.c	Fri Mar 31 10:00:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uthum.c,v 1.10.18.2 2017/01/26 21:54:25 skrll Exp $   */
+/*	$NetBSD: uthum.c,v 1.10.18.3 2017/03/31 10:00:15 skrll Exp $   */
 /*	$OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $   */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10.18.2 2017/01/26 21:54:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10.18.3 2017/03/31 10:00:15 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -294,7 +294,7 @@ uthum_read_data(struct uthum_softc *sc, 
 
 	/* wait if required */
 	if (need_delay > 1)
-		tsleep(>sc_sme, 0, "uthum", (need_delay*hz+999)/1000 + 1);
+		kpause("uthum", false, (need_delay*hz+999)/1000 + 1, NULL);
 
 	/* get answer */
 	if (uhidev_get_report(>sc_hdev, UHID_FEATURE_REPORT,

Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.28.20.2 src/sys/dev/usb/uvscom.c:1.28.20.3
--- src/sys/dev/usb/uvscom.c:1.28.20.2	Thu Jan 26 21:54:25 2017
+++ src/sys/dev/usb/uvscom.c	Fri Mar 31 10:00:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvscom.c,v 1.28.20.2 2017/01/26 21:54:25 skrll Exp $	*/
+/*	$NetBSD: uvscom.c,v 1.28.20.3 2017/03/31 10:00:15 skrll Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama .
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.20.2 2017/01/26 21:54:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.20.3 2017/03/31 10:00:15 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -759,7 +759,7 @@ uvscom_open(void *addr, int portno)
 		/* unit is not ready */
 
 		for (i = UVSCOM_UNIT_WAIT; i > 0; --i) {
-			tsleep(, TTIPRI, "uvsop", hz);	/* XXX */
+			kpause("uvsopen", false, hz, NULL);
 			if (ISSET(sc->sc_usr, UVSCOM_USTAT_MASK))
 break;
 		}

Index: src/sys/dev/usb/uyurex.c
diff -u src/sys/dev/usb/uyurex.c:1.9.12.1.4.3 src/sys/dev/usb/uyurex.c:1.9.12.1.4.4
--- src/sys/dev/usb/uyurex.c:1.9.12.1.4.3	Fri Mar 31 09:38:05 2017
+++ src/sys/dev/usb/uyurex.c	Fri Mar 31 10:00:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uyurex.c,v 1.9.12.1.4.3 2017/03/31 09:38:05 skrll Exp $ */
+/*	$NetBSD: uyurex.c,v 1.9.12.1.4.4 2017/03/31 10:00:15 skrll Exp $ */
 /*	$OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.9.12.1.4.3 2017/03/31 09:38:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.9.12.1.4.4 2017/03/31 10:00:15 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -341,7 +341,7 @@ uyurex_set_mode(struct uyurex_softc *sc,
 	}
 
 	/* wait ack */
-	tsleep(>sc_sme, 0, "uyurex", (1000*hz+999)/1000 + 1);
+	kpause("uyurexsm", false, (1000*hz+999)/1000 + 1, NULL);
 }
 
 void
@@ -359,7 +359,7 @@ uyurex_read_value_request(struct uyurex_
 		return;
 
 	/* wait till sensor data are updated, 500ms will be enough */
-	tsleep(>sc_sme, 0, "uyurex", (500*hz+999)/1000 + 1);
+	kpause("uyurexrd", false, (500*hz+999)/1000 + 1, NULL);
 }
 
 void
@@ -382,5 +382,5 @@ uyurex_write_value_request(struct uyurex
 		return;
 
 	/* wait till sensor data are updated, 250ms will be enough */
-	tsleep(>sc_sme, 0, "uyurex", (250*hz+999)/1000 + 1);
+	kpause("uyurexwr", false, (250*hz+999)/1000 + 1, NULL);
 }

CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 09:38:05 UTC 2017

Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: auvitek_video.c slurm.c uark.c uatp.c
uberry.c ubsa.c udsir.c uhso.c ukyopon.c usbdi_util.c uslsa.c
uyap.c uyurex.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.6.36.1 -r1.6.36.2 src/sys/dev/usb/auvitek_video.c
cvs rdiff -u -r1.1.22.1 -r1.1.22.2 src/sys/dev/usb/slurm.c
cvs rdiff -u -r1.6.18.2 -r1.6.18.3 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.10.2.1.4.2 -r1.10.2.1.4.3 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.9.18.2 -r1.9.18.3 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.30.20.2 -r1.30.20.3 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.1.18.1 -r1.1.18.2 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.16.6.2 -r1.16.6.3 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.16.20.2 -r1.16.20.3 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.62.8.2 -r1.62.8.3 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.19.10.2 -r1.19.10.3 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.19.28.1 -r1.19.28.2 src/sys/dev/usb/uyap.c
cvs rdiff -u -r1.9.12.1.4.2 -r1.9.12.1.4.3 src/sys/dev/usb/uyurex.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/auvitek_video.c
diff -u src/sys/dev/usb/auvitek_video.c:1.6.36.1 src/sys/dev/usb/auvitek_video.c:1.6.36.2
--- src/sys/dev/usb/auvitek_video.c:1.6.36.1	Tue Sep  6 20:33:08 2016
+++ src/sys/dev/usb/auvitek_video.c	Fri Mar 31 09:38:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_video.c,v 1.6.36.1 2016/09/06 20:33:08 skrll Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.6.36.2 2017/03/31 09:38:05 skrll Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.6.36.1 2016/09/06 20:33:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.6.36.2 2017/03/31 09:38:05 skrll Exp $");
 
 #include 
 #include 
@@ -134,7 +134,7 @@ auvitek_video_attach(struct auvitek_soft
 
 	auvitek_video_rescan(sc, NULL, NULL);
 
-	return (sc->sc_videodev != NULL);
+	return sc->sc_videodev != NULL;
 }
 
 int

Index: src/sys/dev/usb/slurm.c
diff -u src/sys/dev/usb/slurm.c:1.1.22.1 src/sys/dev/usb/slurm.c:1.1.22.2
--- src/sys/dev/usb/slurm.c:1.1.22.1	Tue Sep  6 20:33:09 2016
+++ src/sys/dev/usb/slurm.c	Fri Mar 31 09:38:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: slurm.c,v 1.1.22.1 2016/09/06 20:33:09 skrll Exp $ */
+/*	$NetBSD: slurm.c,v 1.1.22.2 2017/03/31 09:38:05 skrll Exp $ */
 
 /*
  * Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.1.22.1 2016/09/06 20:33:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.1.22.2 2017/03/31 09:38:05 skrll Exp $");
 
 #include 
 #include 
@@ -156,7 +156,7 @@ slurm_detach(device_t self, int flags)
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
 
-	return (rv);
+	return rv;
 }
 
 static int

Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.6.18.2 src/sys/dev/usb/uark.c:1.6.18.3
--- src/sys/dev/usb/uark.c:1.6.18.2	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/uark.c	Fri Mar 31 09:38:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uark.c,v 1.6.18.2 2017/01/26 21:54:24 skrll Exp $	*/
+/*	$NetBSD: uark.c,v 1.6.18.3 2017/03/31 09:38:05 skrll Exp $	*/
 /*	$OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.6.18.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.6.18.3 2017/03/31 09:38:05 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -229,7 +229,7 @@ uark_activate(device_t self, enum devact
 		sc->sc_dying = 1;
 		break;
 	}
-	return (rv);
+	return rv;
 }
 
 void
@@ -272,7 +272,7 @@ uark_param(void *vsc, int portno, struct
 		uark_cmd(sc, 3, 0x03);
 		break;
 	default:
-		return (EINVAL);
+		return EINVAL;
 	}
 
 	if (ISSET(t->c_cflag, CSTOPB))
@@ -317,7 +317,7 @@ uark_param(void *vsc, int portno, struct
 	}
 #endif
 
-	return (0);
+	return 0;
 }
 
 void
@@ -363,7 +363,7 @@ uark_cmd(struct uark_softc *sc, uint16_t
 	err = usbd_do_request(sc->sc_udev, , NULL);
 
 	if (err)
-		return (EIO);
+		return EIO;
 
-	return (0);
+	return 0;
 }

Index: src/sys/dev/usb/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.10.2.1.4.2 src/sys/dev/usb/uatp.c:1.10.2.1.4.3
--- src/sys/dev/usb/uatp.c:1.10.2.1.4.2	Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/uatp.c	Fri Mar 31 09:38:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uatp.c,v 1.10.2.1.4.2 2017/01/26 21:54:24 skrll Exp $	*/
+/*	$NetBSD: uatp.c,v 1.10.2.1.4.3 2017/03/31 09:38:05 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.10.2.1.4.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.10.2.1.4.3 2017/03/31 09:38:05 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 

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

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 31 09:40:15 UTC 2017

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

Log Message:
Add t_ping_opts


To generate a diff of this commit:
cvs rdiff -u -r1.729 -r1.730 src/distrib/sets/lists/tests/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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.729 src/distrib/sets/lists/tests/mi:1.730
--- src/distrib/sets/lists/tests/mi:1.729	Wed Mar 22 21:33:06 2017
+++ src/distrib/sets/lists/tests/mi	Fri Mar 31 09:40:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.729 2017/03/22 21:33:06 jdolecek Exp $
+# $NetBSD: mi,v 1.730 2017/03/31 09:40:15 ozaki-r Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3316,6 +3316,7 @@
 ./usr/tests/net/net/t_mtudisc			tests-net-tests		atf,rump
 ./usr/tests/net/net/t_mtudisc6			tests-net-tests		atf,rump
 ./usr/tests/net/net/t_ping6_opts		tests-net-tests		atf,rump
+./usr/tests/net/net/t_ping_opts			tests-net-tests		atf,rump
 ./usr/tests/net/net/t_pktinfo			tests-net-tests		compattestfile,atf
 ./usr/tests/net/net/t_raw			tests-net-tests		atf,rump
 ./usr/tests/net/net/t_tcp			tests-net-tests		compattestfile,atf

CVS commit: src/sys/dev/pci

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 09:27:30 UTC 2017

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Fix BCM4727 entry


To generate a diff of this commit:
cvs rdiff -u -r1.1283 -r1.1284 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1283 src/sys/dev/pci/pcidevs:1.1284
--- src/sys/dev/pci/pcidevs:1.1283	Fri Mar 31 08:53:56 2017
+++ src/sys/dev/pci/pcidevs	Fri Mar 31 09:27:30 2017
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1283 2017/03/31 08:53:56 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1284 2017/03/31 09:27:30 skrll Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1833,7 +1833,7 @@ product BROADCOM BCM43225	0x4357	BCM4322
 product BROADCOM BCM43227	0x4358	BCM43227 2.4GHz 802.11
 product BROADCOM BCM43228	0x4359	BCM43228 Dualband 802.11
 product BROADCOM BCM4401	0x4401	BCM4401 10/100 Ethernet
-product BROADCOM BCM4313	0x4727	BCM4313 802.11b/g/n
+product BROADCOM BCM4727	0x4727	BCM4727 802.11b/g/n
 product BROADCOM 5801		0x5801	5801 Security Processor
 product BROADCOM 5802		0x5802	5802 Security Processor
 product BROADCOM 5805		0x5805	5805 Security Processor

CVS commit: [netbsd-7-nhusb] src/share/man/man9

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 08:55:41 UTC 2017

Modified Files:
src/share/man/man9 [netbsd-7-nhusb]: usbdi.9

Log Message:
Sync with HEAD/nhusb


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.8.1 src/share/man/man9/usbdi.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/usbdi.9
diff -u src/share/man/man9/usbdi.9:1.29 src/share/man/man9/usbdi.9:1.29.8.1
--- src/share/man/man9/usbdi.9:1.29	Thu Sep 26 16:18:52 2013
+++ src/share/man/man9/usbdi.9	Fri Mar 31 08:55:41 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: usbdi.9,v 1.29 2013/09/26 16:18:52 skrll Exp $
+.\"	$NetBSD: usbdi.9,v 1.29.8.1 2017/03/31 08:55:41 skrll Exp $
 .\"
 .\" Copyright (c) 2012 Matthew R. Green
 .\" All rights reserved.
@@ -27,11 +27,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1999, 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Lennart Augustsson.
+.\" by Lennart Augustsson and Nick Hudson.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -54,7 +54,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 26, 2013
+.Dd April 24, 2016
 .Dt USBDI 9
 .Os
 .Sh NAME
@@ -66,144 +66,148 @@
 .In dev/usb/usbdi_util.h
 .Ss Functions offered by usbdi.h
 .Ft usbd_status
-.Fn usbd_open_pipe "usbd_interface_handle iface" "uint8_t address" \
- "uint8_t flags" "usbd_pipe_handle *pipe"
+.Fn usbd_open_pipe "struct usbd_interface *iface" "uint8_t address" \
+ "uint8_t flags" "struct usbd_pipe **pipe"
 .Ft usbd_status
-.Fn usbd_close_pipe "usbd_pipe_handle pipe"
+.Fn usbd_close_pipe "struct usbd_pipe *pipe"
 .Ft usbd_status
-.Fn usbd_transfer "usbd_xfer_handle xfer"
-.Ft usbd_xfer_handle
-.Fn usbd_alloc_xfer "usbd_device_handle dev"
-.Ft usbd_status
-.Fn usbd_free_xfer "usbd_xfer_handle xfer"
-.Ft void
-.Fn usbd_setup_xfer "usbd_xfer_handle xfer" "usbd_pipe_handle pipe" \
- "usbd_private_handle priv" "void *buffer" "uint32_t length" \
+.Fn usbd_transfer "struct usbd_xfer *xfer"
+.Ft struct usbd_xfer *
+.Fn usbd_setup_xfer "struct usbd_xfer *xfer" \
+ "void *priv" "void *buffer" "uint32_t length" \
  "uint16_t flags" "uint32_t timeout" "usbd_callback"
 .Ft void
-.Fn usbd_setup_default_xfer "usbd_xfer_handle xfer" \
- "usbd_device_handle dev" "usbd_private_handle priv" \
+.Fn usbd_setup_default_xfer "struct usbd_xfer *xfer" \
+ "struct usbd_device *dev" "void *priv" \
  "uint32_t timeout" "usb_device_request_t *req" " void *buffer" \
  "uint32_t length" "uint16_t flags" "usbd_callback"
 .Ft void
-.Fn usbd_setup_isoc_xfer "usbd_xfer_handle xfer" "usbd_pipe_handle pipe" \
- "usbd_private_handle priv" "uint16_t *frlengths" \
+.Fn usbd_setup_isoc_xfer "struct usbd_xfer *xfer" \
+ "void *priv" "uint16_t *frlengths" \
  "uint32_t nframes" "uint16_t flags" "usbd_callback"
 .Ft void
-.Fn usbd_get_xfer_status "usbd_xfer_handle xfer" "usbd_private_handle *priv" \
+.Fn usbd_get_xfer_status "struct usbd_xfer *xfer" "void **priv" \
  "void **buffer" "uint32_t *count" "usbd_status *status"
 .Ft usb_endpoint_descriptor_t *
-.Fn usbd_interface2endpoint_descriptor "usbd_interface_handle iface" \
+.Fn usbd_interface2endpoint_descriptor "struct usbd_interface *iface" \
  "uint8_t address"
 .Ft usbd_status
-.Fn usbd_abort_pipe "usbd_pipe_handle pipe"
+.Fn usbd_abort_pipe "struct usbd_pipe *pipe"
 .Ft usbd_status
-.Fn usbd_abort_default_pipe "usbd_device_handle dev"
+.Fn usbd_abort_default_pipe "struct usbd_device *dev"
 .Ft usbd_status
-.Fn usbd_clear_endpoint_stall "usbd_pipe_handle pipe"
+.Fn usbd_clear_endpoint_stall "struct usbd_pipe *pipe"
 .Ft usbd_status
-.Fn usbd_clear_endpoint_stall_async "usbd_pipe_handle pipe"
+.Fn usbd_clear_endpoint_stall_async "struct usbd_pipe *pipe"
 .Ft void
-.Fn usbd_clear_endpoint_toggle "usbd_pipe_handle pipe"
+.Fn usbd_clear_endpoint_toggle "struct usbd_pipe *pipe"
 .Ft usbd_status
-.Fn usbd_endpoint_count "usbd_interface_handle dev" "uint8_t *count"
+.Fn usbd_endpoint_count "struct usbd_interface *dev" "uint8_t *count"
 .Ft usbd_status
-.Fn usbd_interface_count "usbd_device_handle dev" "uint8_t *count"
+.Fn usbd_interface_count "struct usbd_device *dev" "uint8_t *count"
 .Ft usbd_status
-.Fn usbd_interface2device_handle "usbd_interface_handle iface" "usbd_device_handle *dev"
+.Fn usbd_interface2device_handle "struct usbd_interface *iface" "struct usbd_device **dev"
 .Ft usbd_status
-.Fn usbd_device2interface_handle "usbd_device_handle dev" "uint8_t ifaceno" "usbd_interface_handle *iface"
+.Fn usbd_device2interface_handle "struct usbd_device *dev" "uint8_t ifaceno" "struct usbd_interface **iface"
 .Pp
-.Ft usbd_device_handle
-.Fn 

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Mar 31 08:54:51 UTC 2017

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1274 -r1.1275 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1273 -r1.1274 src/sys/dev/pci/pcidevs_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/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1274 src/sys/dev/pci/pcidevs.h:1.1275
--- src/sys/dev/pci/pcidevs.h:1.1274	Thu Mar 23 03:15:16 2017
+++ src/sys/dev/pci/pcidevs.h	Fri Mar 31 08:54:51 2017
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1274 2017/03/23 03:15:16 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1275 2017/03/31 08:54:51 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1282 2017/03/23 03:14:03 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1283 2017/03/31 08:53:56 msaitoh Exp
  */
 
 /*
@@ -1840,6 +1840,7 @@
 #define	PCI_PRODUCT_BROADCOM_BCM43227	0x4358		/* BCM43227 2.4GHz 802.11 */
 #define	PCI_PRODUCT_BROADCOM_BCM43228	0x4359		/* BCM43228 Dualband 802.11 */
 #define	PCI_PRODUCT_BROADCOM_BCM4401	0x4401		/* BCM4401 10/100 Ethernet */
+#define	PCI_PRODUCT_BROADCOM_BCM4313	0x4727		/* BCM4313 802.11b/g/n */
 #define	PCI_PRODUCT_BROADCOM_5801	0x5801		/* 5801 Security Processor */
 #define	PCI_PRODUCT_BROADCOM_5802	0x5802		/* 5802 Security Processor */
 #define	PCI_PRODUCT_BROADCOM_5805	0x5805		/* 5805 Security Processor */
@@ -4553,6 +4554,7 @@
 #define	PCI_PRODUCT_INTEL_PINEVIEW_IGD_1	0xa002		/* Pineview Integrated Graphics Device */
 #define	PCI_PRODUCT_INTEL_PINEVIEW_M_HB	0xa010		/* Pineview Host Bridge */
 #define	PCI_PRODUCT_INTEL_PINEVIEW_M_IGD	0xa011		/* Pineview Integrated Graphics Device */
+#define	PCI_PRODUCT_INTEL_PINEVIEW_M_IGD_1	0xa012		/* Pineview Integrated Graphics Device */
 #define	PCI_PRODUCT_INTEL_Z170_AHCI	0xa102		/* Z170 AHCI */
 #define	PCI_PRODUCT_INTEL_Z170_3RD_AHCI	0xa106		/* Z170 3rd Party RAID */
 #define	PCI_PRODUCT_INTEL_100SERIES_PCIE_1	0xa110		/* 100 Series PCIE */
@@ -5858,6 +5860,7 @@
 #define	PCI_PRODUCT_RDC_R6061_EHCI	0x6061		/* R6061 USB EHCI */
 
 /* Realtek products */
+#define	PCI_PRODUCT_REALTEK_RTS5208	0x5208		/* RTS5208 PCI-E Card Reader */
 #define	PCI_PRODUCT_REALTEK_RTS5209	0x5209		/* RTS5209 PCI-E Card Reader */
 #define	PCI_PRODUCT_REALTEK_RTS5227	0x5227		/* RTS5227 PCI-E Card Reader */
 #define	PCI_PRODUCT_REALTEK_RTS5229	0x5229		/* RTS5229 PCI-E Card Reader */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1273 src/sys/dev/pci/pcidevs_data.h:1.1274
--- src/sys/dev/pci/pcidevs_data.h:1.1273	Thu Mar 23 03:15:15 2017
+++ src/sys/dev/pci/pcidevs_data.h	Fri Mar 31 08:54:51 2017
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1273 2017/03/23 03:15:15 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1274 2017/03/31 08:54:51 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1282 2017/03/23 03:14:03 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1283 2017/03/31 08:53:56 msaitoh Exp
  */
 
 /*
@@ -2743,6 +2743,8 @@ static const uint16_t pci_products[] = {
 	12514, 12315, 12456, 0,
 	PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM4401, 
 	12523, 5664, 5562, 0,
+	PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM4313, 
+	12324, 12436, 0,
 	PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5801, 
 	12531, 8096, 10803, 0,
 	PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5802, 
@@ -7835,6 +7837,8 @@ static const uint16_t pci_products[] = {
 	23066, 6798, 6408, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_M_IGD, 
 	23066, 692, 1716, 2427, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PINEVIEW_M_IGD_1, 
+	23066, 692, 1716, 2427, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z170_AHCI, 
 	23075, 8375, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z170_3RD_AHCI, 
@@ -10101,428 +10105,430 @@ static const uint16_t pci_products[] = {
 	27959, 6790, 8140, 0,
 	PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6061_EHCI, 
 	27965, 6790, 8145, 0,
-	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5209, 
+	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5208, 
 	27971, 16113, 11140, 14727, 0,
-	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5227, 
+	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5209, 
 	27979, 16113, 11140, 14727, 0,
-	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5229, 
+	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5227, 
 	27987, 16113, 11140, 14727, 0,
-	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5249, 
+	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5229, 
 	27995, 16113, 11140, 14727, 0,
-	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8402, 
+	PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5249, 
 	28003, 16113, 11140, 14727, 0,
-	PCI_VENDOR_REALTEK, 

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Mar 31 08:53:56 UTC 2017

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
- Add BROADCOM BCM4313 802.11b/g/n
- Add Intel's another Pineview Integrated Graphics Device
- Add Realtek RTS5208 PCI-E Card Reader


To generate a diff of this commit:
cvs rdiff -u -r1.1282 -r1.1283 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1282 src/sys/dev/pci/pcidevs:1.1283
--- src/sys/dev/pci/pcidevs:1.1282	Thu Mar 23 03:14:03 2017
+++ src/sys/dev/pci/pcidevs	Fri Mar 31 08:53:56 2017
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1282 2017/03/23 03:14:03 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1283 2017/03/31 08:53:56 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1833,6 +1833,7 @@ product BROADCOM BCM43225	0x4357	BCM4322
 product BROADCOM BCM43227	0x4358	BCM43227 2.4GHz 802.11
 product BROADCOM BCM43228	0x4359	BCM43228 Dualband 802.11
 product BROADCOM BCM4401	0x4401	BCM4401 10/100 Ethernet
+product BROADCOM BCM4313	0x4727	BCM4313 802.11b/g/n
 product BROADCOM 5801		0x5801	5801 Security Processor
 product BROADCOM 5802		0x5802	5802 Security Processor
 product BROADCOM 5805		0x5805	5805 Security Processor
@@ -4546,6 +4547,7 @@ product INTEL PINEVIEW_IGD	0xa001	Pinevi
 product INTEL PINEVIEW_IGD_1	0xa002	Pineview Integrated Graphics Device
 product INTEL PINEVIEW_M_HB	0xa010	Pineview Host Bridge
 product INTEL PINEVIEW_M_IGD	0xa011	Pineview Integrated Graphics Device
+product INTEL PINEVIEW_M_IGD_1	0xa012	Pineview Integrated Graphics Device
 product INTEL Z170_AHCI		0xa102	Z170 AHCI
 product INTEL Z170_3RD_AHCI	0xa106	Z170 3rd Party RAID
 product INTEL 100SERIES_PCIE_1	0xa110	100 Series PCIE
@@ -5851,6 +5853,7 @@ product RDC	R6060_OHCI	0x6060	R6060 USB 
 product RDC	R6061_EHCI	0x6061	R6061 USB EHCI
 
 /* Realtek products */
+product REALTEK RTS5208		0x5208	RTS5208 PCI-E Card Reader
 product REALTEK RTS5209		0x5209	RTS5209 PCI-E Card Reader
 product REALTEK RTS5227		0x5227	RTS5227 PCI-E Card Reader
 product REALTEK RTS5229		0x5229	RTS5229 PCI-E Card Reader

CVS commit: src/sys/kern

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Mar 31 08:50:54 UTC 2017

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

Log Message:
spaces to tab


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/sys/kern/kern_fork.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_fork.c
diff -u src/sys/kern/kern_fork.c:1.200 src/sys/kern/kern_fork.c:1.201
--- src/sys/kern/kern_fork.c:1.200	Fri Mar 31 08:47:04 2017
+++ src/sys/kern/kern_fork.c	Fri Mar 31 08:50:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_fork.c,v 1.200 2017/03/31 08:47:04 martin Exp $	*/
+/*	$NetBSD: kern_fork.c,v 1.201 2017/03/31 08:50:54 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.200 2017/03/31 08:47:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.201 2017/03/31 08:50:54 skrll Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
@@ -504,7 +504,7 @@ fork1(struct lwp *l1, int flags, int exi
 	if (p2->p_slflag & PSL_TRACED) {
 		ksiginfo_t ksi;
 
-KSI_INIT_EMPTY();
+		KSI_INIT_EMPTY();
 		ksi.ksi_signo = SIGTRAP;
 		ksi.ksi_code = TRAP_CHLD;
 		ksi.ksi_lid = l2->l_lid;

CVS commit: src/sys

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Mar 31 08:47:04 UTC 2017

Modified Files:
src/sys/arch/x86/x86: syscall.c
src/sys/kern: kern_fork.c kern_sig.c

Log Message:
PR kern/52117: move stop code for debuged children after fork into MI code.
XXX we might want to revisit this when handling the same event for vfork
better.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/x86/syscall.c
cvs rdiff -u -r1.199 -r1.200 src/sys/kern/kern_fork.c
cvs rdiff -u -r1.334 -r1.335 src/sys/kern/kern_sig.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/x86/x86/syscall.c
diff -u src/sys/arch/x86/x86/syscall.c:1.14 src/sys/arch/x86/x86/syscall.c:1.15
--- src/sys/arch/x86/x86/syscall.c:1.14	Thu Jul  7 06:55:40 2016
+++ src/sys/arch/x86/x86/syscall.c	Fri Mar 31 08:47:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.14 2016/07/07 06:55:40 msaitoh Exp $	*/
+/*	$NetBSD: syscall.c,v 1.15 2017/03/31 08:47:04 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.14 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.15 2017/03/31 08:47:04 martin Exp $");
 
 #include 
 #include 
@@ -65,18 +65,6 @@ child_return(void *arg)
 {
 	struct lwp *l = arg;
 	struct trapframe *tf = l->l_md.md_regs;
-	struct proc *p = l->l_proc;
-
-	if (p->p_slflag & PSL_TRACED) {
-		ksiginfo_t ksi;
-
-		mutex_enter(proc_lock);
-KSI_INIT_EMPTY();
-ksi.ksi_signo = SIGTRAP;
-ksi.ksi_lid = l->l_lid;
-kpsignal(p, , NULL);
-		mutex_exit(proc_lock);
-	}
 
 	X86_TF_RAX(tf) = 0;
 	X86_TF_RFLAGS(tf) &= ~PSL_C;

Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.199 src/sys/kern/kern_fork.c:1.200
--- src/sys/kern/kern_fork.c:1.199	Fri Jan 13 23:00:35 2017
+++ src/sys/kern/kern_fork.c	Fri Mar 31 08:47:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_fork.c,v 1.199 2017/01/13 23:00:35 kamil Exp $	*/
+/*	$NetBSD: kern_fork.c,v 1.200 2017/03/31 08:47:04 martin Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.199 2017/01/13 23:00:35 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.200 2017/03/31 08:47:04 martin Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
@@ -500,6 +500,17 @@ fork1(struct lwp *l1, int flags, int exi
 	(*p2->p_emul->e_syscall_intern)(p2);
 #endif
 
+	/* if we are being traced, give the owner a chance to interfere */
+	if (p2->p_slflag & PSL_TRACED) {
+		ksiginfo_t ksi;
+
+KSI_INIT_EMPTY();
+		ksi.ksi_signo = SIGTRAP;
+		ksi.ksi_code = TRAP_CHLD;
+		ksi.ksi_lid = l2->l_lid;
+		kpsignal(p2, , NULL);
+	}
+
 	/*
 	 * Update stats now that we know the fork was successful.
 	 */

Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.334 src/sys/kern/kern_sig.c:1.335
--- src/sys/kern/kern_sig.c:1.334	Fri Mar 24 17:40:44 2017
+++ src/sys/kern/kern_sig.c	Fri Mar 31 08:47:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sig.c,v 1.334 2017/03/24 17:40:44 christos Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.335 2017/03/31 08:47:04 martin Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.334 2017/03/24 17:40:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.335 2017/03/31 08:47:04 martin Exp $");
 
 #include "opt_ptrace.h"
 #include "opt_dtrace.h"
@@ -1224,7 +1224,7 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
 	ksiginfo_t *kp;
 	lwpid_t lid;
 	sig_t action;
-	bool toall;
+	bool toall, debtrap = false;
 	int error = 0;
 
 	KASSERT(!cpu_intr_p());
@@ -1237,8 +1237,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
 	 * If the process is being created by fork, is a zombie or is
 	 * exiting, then just drop the signal here and bail out.
 	 */
-	if (p->p_stat != SACTIVE && p->p_stat != SSTOP)
+	if (p->p_stat == SIDL && signo == SIGTRAP
+	&& (p->p_slflag & PSL_TRACED)) {
+		/* allow an initial SIGTRAP for traced processes */
+		debtrap = true;
+	} else if (p->p_stat != SACTIVE && p->p_stat != SSTOP) {
 		return 0;
+	}
 
 	/* XXX for core dump/debugger */
 	p->p_sigctx.ps_lwp = ksi->ksi_lid;
@@ -1353,7 +1358,13 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
 	 * the signal to it.
 	 */
 	if (lid != 0) {
-		l = lwp_find(p, lid);
+		if (__predict_false(debtrap)) {
+			l = LIST_FIRST(>p_lwps);
+			if (l->l_lid != lid)
+l = NULL;
+		} else {
+			l = lwp_find(p, lid);
+		}
 		if (l != NULL) {
 			if ((error = sigput(>l_sigpend, p, kp)) != 0)
 goto out;

CVS commit: src/sys

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Mar 31 08:38:14 UTC 2017

Modified Files:
src/sys/arch/hpcmips/vr: vrc4173bcu.c
src/sys/arch/i386/mca: mca_machdep.c
src/sys/arch/macppc/dev: mesh.c snapper.c
src/sys/arch/newsmips/apbus: spifi.c
src/sys/arch/next68k/dev: esp.c mb8795.c nextdma.c
src/sys/arch/next68k/next68k: isr.c
src/sys/arch/vax/vax: crl.c ka650.c
src/sys/dev/ic: midway.c
src/sys/dev/isa: if_iy.c
src/sys/dev/marvell: gtidmac.c
src/sys/dev/pci: ichsmb.c
src/sys/kern: vfs_subr.c

Log Message:
 Remove extra 0x. This bug was added when replacing bitmask_snprintf(9) with
snprintb(3) (in between NetBSD 5 and 6). Old bitmask_snprint(9) didn't add
0x" automatically for hexadecimal value, so old code used it with "0x%s".


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcmips/vr/vrc4173bcu.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/mca/mca_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/macppc/dev/mesh.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/newsmips/apbus/spifi.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/next68k/dev/esp.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/next68k/dev/nextdma.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/next68k/next68k/isr.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/crl.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/vax/vax/ka650.c
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/ic/midway.c
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/marvell/gtidmac.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.460 -r1.461 src/sys/kern/vfs_subr.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/hpcmips/vr/vrc4173bcu.c
diff -u src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.23 src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24
--- src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.23	Sat Mar 29 19:28:28 2014
+++ src/sys/arch/hpcmips/vr/vrc4173bcu.c	Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vrc4173bcu.c,v 1.23 2014/03/29 19:28:28 christos Exp $	*/
+/*	$NetBSD: vrc4173bcu.c,v 1.24 2017/03/31 08:38:13 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2001,2002 Enami Tsugutomo.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.23 2014/03/29 19:28:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.24 2017/03/31 08:38:13 msaitoh Exp $");
 
 #include 
 #include 
@@ -344,19 +344,19 @@ vrc4173bcu_attach(device_t parent, devic
 	snprintb(buf, sizeof(buf),
 	"\20\1USB\2PCMCIA2\3PCMCIA1\4PS2CH2\5PS2CH1\6PIU\7AIU\10KIU"
 	"\11GIU\12AC97\13AC97-1\14B11\15B12\16DOZEPIU\17B14\20B15", reg);
-	printf("%s: SYSINT1 = 0x%s\n", device_xname(self), buf);
+	printf("%s: SYSINT1 = %s\n", device_xname(self), buf);
 
 	reg = bus_space_read_2(sc->sc_iot, sc->sc_icuh, VRC4173ICU_MKIUINT);
 	snprintb(buf, sizeof(buf),
 	"\20\1SCANINT\2KDATRDY\3KDATLOST\4B3\5B4\6B5\7B6\10B7"
 	"\11B8\12B9\13B10\14B11\15B12\16B13\17B14\20B15", reg);
-	printf("%s: MKIUINT = 0x%s\n", device_xname(self), buf);
+	printf("%s: MKIUINT = %s\n", device_xname(self), buf);
 
 	reg = bus_space_read_2(sc->sc_iot, sc->sc_icuh, VRC4173ICU_MSYSINT1);
 	snprintb(buf, sizeof(buf),
 	"\20\1USB\2PCMCIA2\3PCMCIA1\4PS2CH2\5PS2CH1\6PIU\7AIU\10KIU"
 	"\11GIU\12AC97\13AC97-1\14B11\15B12\16DOZEPIU\17B14\20B15", reg);
-	printf("%s: MSYSINT1 = 0x%s\n", device_xname(self), buf);
+	printf("%s: MSYSINT1 = %s\n", device_xname(self), buf);
 
 #if 1
 	reg = VRC4173ICU_USBINTR | VRC4173ICU_PIUINTR | VRC4173ICU_KIUINTR |
@@ -367,7 +367,7 @@ vrc4173bcu_attach(device_t parent, devic
 	snprintb(buf, sizeof(buf),
 	"\20\1USB\2PCMCIA2\3PCMCIA1\4PS2CH2\5PS2CH1\6PIU\7AIU\10KIU"
 	"\11GIU\12AC97\13AC97-1\14B11\15B12\16DOZEPIU\17B14\20B15", reg);
-	printf("%s: MSYSINT1 = 0x%s\n", device_xname(self), buf);
+	printf("%s: MSYSINT1 = %s\n", device_xname(self), buf);
 #endif
 #endif
 

Index: src/sys/arch/i386/mca/mca_machdep.c
diff -u src/sys/arch/i386/mca/mca_machdep.c:1.43 src/sys/arch/i386/mca/mca_machdep.c:1.44
--- src/sys/arch/i386/mca/mca_machdep.c:1.43	Thu Sep  1 15:10:31 2011
+++ src/sys/arch/i386/mca/mca_machdep.c	Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mca_machdep.c,v 1.43 2011/09/01 15:10:31 christos Exp $	*/
+/*	$NetBSD: mca_machdep.c,v 1.44 2017/03/31 08:38:13 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.43 2011/09/01 15:10:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.44 2017/03/31 08:38:13 msaitoh Exp $");
 
 #include 
 #include 
@@ -311,7 +311,7 @@ mca_busprobe(void)
 		"\017KBDF"
 		"\020DMA32\n", (scp->feature2 << 8) | scp->feature1);
 
-	

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 31 06:49:44 UTC 2017

Modified Files:
src/sys/netinet: ip_icmp.c ip_input.c ip_var.h tcp_input.c
src/sys/sys: mbuf.h

Log Message:
Don't use a single global variable to store source route information for 
multiple incoming packets

It's not MP-safe. So use a m_tag to store the information instead.

Pointed out by knakahara@
The fix is from OpenBSD (originally fixed in FreeBSD)


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.353 -r1.354 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.118 -r1.119 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.355 -r1.356 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.168 -r1.169 src/sys/sys/mbuf.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/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.160 src/sys/netinet/ip_icmp.c:1.161
--- src/sys/netinet/ip_icmp.c:1.160	Mon Mar  6 07:31:15 2017
+++ src/sys/netinet/ip_icmp.c	Fri Mar 31 06:49:44 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_icmp.c,v 1.160 2017/03/06 07:31:15 ozaki-r Exp $	*/
+/*	$NetBSD: ip_icmp.c,v 1.161 2017/03/31 06:49:44 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.160 2017/03/06 07:31:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.161 2017/03/31 06:49:44 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -888,7 +888,7 @@ icmp_reflect(struct mbuf *m)
 		 * add on any record-route or timestamp options.
 		 */
 		cp = (u_char *) (ip + 1);
-		if ((opts = ip_srcroute()) == NULL &&
+		if ((opts = ip_srcroute(m)) == NULL &&
 		(opts = m_gethdr(M_DONTWAIT, MT_HEADER))) {
 			MCLAIM(opts, m->m_owner);
 			opts->m_len = sizeof(struct in_addr);

Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.353 src/sys/netinet/ip_input.c:1.354
--- src/sys/netinet/ip_input.c:1.353	Fri Mar 31 06:42:19 2017
+++ src/sys/netinet/ip_input.c	Fri Mar 31 06:49:44 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.353 2017/03/31 06:42:19 ozaki-r Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.354 2017/03/31 06:49:44 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.353 2017/03/31 06:42:19 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.354 2017/03/31 06:49:44 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -253,25 +253,23 @@ EVCNT_ATTACH_STATIC(ip_swcsum);
 #endif /* INET_CSUM_COUNTERS */
 
 /*
- * We need to save the IP options in case a protocol wants to respond
+ * Used to save the IP options in case a protocol wants to respond
  * to an incoming packet over the same route if the packet got here
  * using IP source routing.  This allows connection establishment and
  * maintenance when the remote end is on a network that is not known
  * to us.
  */
-
-static int	ip_nhops = 0;
-
-static	struct ip_srcrt {
-	struct	in_addr dst;			/* final destination */
-	char	nop;/* one NOP to align */
-	char	srcopt[IPOPT_OFFSET + 1];	/* OPTVAL, OLEN and OFFSET */
-	struct	in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)];
-} ip_srcrt;
+struct ip_srcrt {
+	int		isr_nhops;		   /* number of hops */
+	struct in_addr	isr_dst;		   /* final destination */
+	char		isr_nop;		   /* one NOP to align */
+	char		isr_hdr[IPOPT_OFFSET + 1]; /* OPTVAL, OLEN & OFFSET */
+	struct in_addr	isr_routes[MAX_IPOPTLEN/sizeof(struct in_addr)];
+};
 
 static int ip_drainwanted;
 
-static void save_rte(u_char *, struct in_addr);
+static void save_rte(struct mbuf *, u_char *, struct in_addr);
 
 #ifdef MBUFTRACE
 struct mowner ip_rx_mowner = MOWNER_INIT("internet", "rx");
@@ -664,7 +662,6 @@ ip_input(struct mbuf *m)
 	 * error was detected (causing an icmp message
 	 * to be sent and the original packet to be freed).
 	 */
-	ip_nhops = 0;		/* for source routed packets */
 	if (hlen > sizeof (struct ip) && ip_dooptions(m)) {
 		m = NULL;
 		goto out;
@@ -987,7 +984,7 @@ ip_dooptions(struct mbuf *m)
 /*
  * End of source route.  Should be for us.
  */
-save_rte(cp, ip->ip_src);
+save_rte(m, cp, ip->ip_src);
 break;
 			}
 			/*
@@ -1226,16 +1223,25 @@ ip_rtaddr(struct in_addr dst, struct psr
  * up later by ip_srcroute if the receiver is interested.
  */
 static void
-save_rte(u_char *option, struct in_addr dst)
+save_rte(struct mbuf *m, u_char *option, struct in_addr dst)
 {
+	struct ip_srcrt *isr;
+	struct m_tag *mtag;
 	unsigned olen;
 
 	olen = option[IPOPT_OLEN];
-	if (olen > sizeof(ip_srcrt) - (1 + sizeof(dst)))
+	if (olen > sizeof(isr->isr_hdr) + sizeof(isr->isr_routes))
+		return;
+
+	mtag = m_tag_get(PACKET_TAG_SRCROUTE, sizeof(*isr), M_NOWAIT);
+	if (mtag == NULL)
 		return;
-	memcpy((void *)ip_srcrt.srcopt, (void *)option, olen);
-	

CVS commit: src/sys/netinet

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 31 06:42:19 UTC 2017

Modified Files:
src/sys/netinet: ip_input.c

Log Message:
Don't use a single global variable as a temporal storage for multiple packets

It's not MP-safe. So use local variables instead.


To generate a diff of this commit:
cvs rdiff -u -r1.352 -r1.353 src/sys/netinet/ip_input.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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.352 src/sys/netinet/ip_input.c:1.353
--- src/sys/netinet/ip_input.c:1.352	Mon Mar  6 07:31:15 2017
+++ src/sys/netinet/ip_input.c	Fri Mar 31 06:42:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.352 2017/03/06 07:31:15 ozaki-r Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.353 2017/03/31 06:42:19 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.352 2017/03/06 07:31:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.353 2017/03/31 06:42:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -271,11 +271,6 @@ static	struct ip_srcrt {
 
 static int ip_drainwanted;
 
-struct	sockaddr_in ipaddr = {
-	.sin_len = sizeof(ipaddr),
-	.sin_family = AF_INET,
-};
-
 static void save_rte(u_char *, struct in_addr);
 
 #ifdef MBUFTRACE
@@ -950,6 +945,11 @@ ip_dooptions(struct mbuf *m)
 		case IPOPT_LSRR:
 		case IPOPT_SSRR: {
 			struct psref psref;
+			struct sockaddr_in ipaddr = {
+			.sin_len = sizeof(ipaddr),
+			.sin_family = AF_INET,
+			};
+
 			if (ip_allowsrcrt == 0) {
 type = ICMP_UNREACH;
 code = ICMP_UNREACH_NET_PROHIB;
@@ -1024,6 +1024,11 @@ ip_dooptions(struct mbuf *m)
 
 		case IPOPT_RR: {
 			struct psref psref;
+			struct sockaddr_in ipaddr = {
+			.sin_len = sizeof(ipaddr),
+			.sin_family = AF_INET,
+			};
+
 			if (optlen < IPOPT_OFFSET + sizeof(*cp)) {
 code = [IPOPT_OLEN] - (u_char *)ip;
 goto bad;
@@ -1090,6 +1095,10 @@ ip_dooptions(struct mbuf *m)
 			case IPOPT_TS_TSANDADDR: {
 struct ifnet *rcvif;
 int _s, _ss;
+struct sockaddr_in ipaddr = {
+.sin_len = sizeof(ipaddr),
+.sin_family = AF_INET,
+};
 
 if (ipt->ipt_ptr - 1 + sizeof(n_time) +
 sizeof(struct in_addr) > ipt->ipt_len) {
@@ -1117,7 +1126,12 @@ ip_dooptions(struct mbuf *m)
 break;
 			}
 
-			case IPOPT_TS_PRESPEC:
+			case IPOPT_TS_PRESPEC: {
+struct sockaddr_in ipaddr = {
+.sin_len = sizeof(ipaddr),
+.sin_family = AF_INET,
+};
+
 if (ipt->ipt_ptr - 1 + sizeof(n_time) +
 sizeof(struct in_addr) > ipt->ipt_len) {
 	code = (u_char *)>ipt_ptr -
@@ -1135,6 +1149,7 @@ ip_dooptions(struct mbuf *m)
 pserialize_read_exit(s);
 ipt->ipt_ptr += sizeof(struct in_addr);
 break;
+			}
 
 			default:
 /* XXX can't take >ipt_flg */

CVS commit: src/tests/net/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri Mar 31 06:41:40 UTC 2017

Modified Files:
src/tests/net/net: Makefile
Added Files:
src/tests/net/net: t_ping_opts.sh

Log Message:
Add test cases for ping options


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/net/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/net/t_ping_opts.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/net/Makefile
diff -u src/tests/net/net/Makefile:1.19 src/tests/net/net/Makefile:1.20
--- src/tests/net/net/Makefile:1.19	Thu Nov 24 08:52:20 2016
+++ src/tests/net/net/Makefile	Fri Mar 31 06:41:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/11/24 08:52:20 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.20 2017/03/31 06:41:40 ozaki-r Exp $
 #
 
 .include 
@@ -13,7 +13,7 @@ TESTS_C+=	t_pktinfo
 TESTS_C+=	t_raw
 
 .for name in forwarding ipaddress ipv6address ipv6_lifetime mtudisc mtudisc6 \
-ping6_opts
+ping_opts ping6_opts
 TESTS_SH+=		t_${name}
 TESTS_SH_SRC_t_${name}=	../net_common.sh t_${name}.sh
 .endfor

Added files:

Index: src/tests/net/net/t_ping_opts.sh
diff -u /dev/null src/tests/net/net/t_ping_opts.sh:1.1
--- /dev/null	Fri Mar 31 06:41:40 2017
+++ src/tests/net/net/t_ping_opts.sh	Fri Mar 31 06:41:40 2017
@@ -0,0 +1,338 @@
+#	$NetBSD: t_ping_opts.sh,v 1.1 2017/03/31 06:41:40 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.
+#
+
+SOCKSRC=unix://ping_opts1
+SOCKFWD=unix://ping_opts2
+SOCKDST=unix://ping_opts3
+IPSRC=10.0.1.2
+IPSRCGW=10.0.1.1
+IPDSTGW=10.0.2.1
+IPDST=10.0.2.2
+BUS_SRCGW=bus1
+BUS_DSTGW=bus2
+
+IPSRC2=10.0.1.3
+IPSRCGW2=10.0.1.254
+
+DEBUG=${DEBUG:-false}
+TIMEOUT=1
+PING_OPTS="-n -c 1 -w $TIMEOUT"
+
+#
+# Utility functions
+#
+setup_endpoint()
+{
+	local sock=${1}
+	local addr=${2}
+	local bus=${3}
+	local gw=${4}
+
+	rump_server_add_iface $sock shmif0 $bus
+
+	export RUMP_SERVER=${sock}
+	atf_check -s exit:0 rump.ifconfig shmif0 ${addr}/24
+	atf_check -s exit:0 -o ignore rump.route add default ${gw}
+	atf_check -s exit:0 rump.ifconfig shmif0 up
+	atf_check -s exit:0 rump.ifconfig -w 10
+
+	if $DEBUG; then
+		rump.ifconfig shmif0
+		rump.netstat -nr
+	fi
+}
+
+setup_forwarder()
+{
+
+	rump_server_add_iface $SOCKFWD shmif0 $BUS_SRCGW
+	rump_server_add_iface $SOCKFWD shmif1 $BUS_DSTGW
+
+	export RUMP_SERVER=$SOCKFWD
+
+	atf_check -s exit:0 rump.ifconfig shmif0 ${IPSRCGW}/24
+	atf_check -s exit:0 rump.ifconfig shmif1 ${IPDSTGW}/24
+
+	atf_check -s exit:0 rump.ifconfig shmif0 up
+	atf_check -s exit:0 rump.ifconfig shmif1 up
+	atf_check -s exit:0 rump.ifconfig -w 10
+
+	if $DEBUG; then
+		rump.netstat -nr
+		rump.sysctl net.inet.ip.forwarding
+	fi
+}
+
+setup_forwarding()
+{
+
+	export RUMP_SERVER=$SOCKFWD
+	atf_check -s exit:0 -o ignore rump.sysctl -w net.inet.ip.forwarding=1
+}
+
+setup()
+{
+
+	rump_server_start $SOCKSRC
+	rump_server_start $SOCKFWD
+	rump_server_start $SOCKDST
+
+	setup_endpoint $SOCKSRC $IPSRC $BUS_SRCGW $IPSRCGW
+	setup_endpoint $SOCKDST $IPDST $BUS_DSTGW $IPDSTGW
+	setup_forwarder
+}
+
+check_echo_request_pkt()
+{
+	local pkt="$1 > $2: .+ echo request"
+
+	extract_new_packets $BUS_SRCGW > ./out
+	$DEBUG && echo $pkt
+	$DEBUG && cat ./out
+	atf_check -s exit:0 -o match:"$pkt" cat ./out
+}
+
+check_echo_request_pkt_with_macaddr()
+{
+	local pkt="$1 > $2, .+ $3 > $4: .+ echo request"
+
+	extract_new_packets $BUS_SRCGW > ./out
+	$DEBUG && echo $pkt
+	$DEBUG && cat ./out
+	atf_check -s exit:0 -o match:"$pkt" cat ./out
+}
+
+check_echo_request_pkt_with_macaddr_and_rthdr0()
+{
+	local pkt=
+
+	pkt="$1 > 

CVS commit: src/etc/ssh

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Fri Mar 31 06:26:50 UTC 2017

Modified Files:
src/etc/ssh: ssh_known_hosts

Log Message:
add ssh-ed25519 keys
verify keys (split vir functions off from mollari)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.9 src/etc/ssh/ssh_known_hosts:1.10
--- src/etc/ssh/ssh_known_hosts:1.9	Wed Sep 23 12:14:51 2015
+++ src/etc/ssh/ssh_known_hosts	Fri Mar 31 06:26:50 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.9 2015/09/23 12:14:51 wiz Exp $
+#	$NetBSD: ssh_known_hosts,v 1.10 2017/03/31 06:26:50 spz Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -6,49 +6,85 @@ anoncvs.netbsd.org ecdsa-sha2-nistp521 A
 #
 cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk=
 
+cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IKs9vV7cSDdIw8hFUiIA+T9QIaZeLi963yuwe8zoCnsJ
+
 cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAGFloNiNSqIkMFVBUglnE9AgBI6J5cLh4hej8DZEtn4InWbFD3dxIFLvw8ZA3qLpVX/TCjFt++MEO3w5GJ2L7a2zQHGIn50E5KVcHuh9arVYRhLPqs9Vfl6ANJ6WiQ81f5k/dZ6ESI8BwqOyQY22/zTujyL8FGHvlZukNsB4iie7Wl+/Q==
 #
 ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
 
 morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc=
 
+ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh
+
+morden.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ILx3zN5uEgRjNYqndcHwVOocWXOcHsufGsZdxNcLnJdh
+
 ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A==
 
 morden.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAFp8B5B8/cosThWLYgZp0jQGIqduvJUlra4gyCCqKLnaTn44cPltjjDWp1UHRsdVjm8ka81EYSJ95ZgD8lbPE/XZwBBmisSzTVoQT+b2x7ENPz2BOAgjxX5Lljy6Z2vpky8Gtu2nNJlFtekPbAS4wyDxHuwR5SZMEYNPTWegtBcvm460A==
 #
 mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
 
+mail.netbsd.org,homeworld.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IFnVCBKDY0sNBJM4ip5Ql0KPsDAmQ+URkOelrQPO1ojv
+
 mail.netbsd.org,homeworld.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBADOK8FUImVH0iPCzfwBD9gT8AUELweTGWry8eBXFbxCDcOYW+4HRtUuY7OqP/sJ8tlYCNg9F+PjAIDqp72h6YgPcQH2/M/8ZXizAT7y7uCiysYxMKYbmuBHqVybaJd5rWUNL19JE6e3H+KBkwYQbf7Jrrs6RhDYMCguPmi6ppNEEEAAcQ==
 #
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
+pkgbuild.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5IINkiJ9FjD7QWexC7bssHKVe+ZbMYMWnltwzgZmloZKz
+
 pkgbuild.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAE7rzIErnIESapcXZJYCMmlNlS3cbeE9zbvraS0/woWexchdhVxLOi/qkfqM5U0Zkin1ooNsUfEYmaJ1k1T+LHbzAAGwZMo/aESnTEekYgBSwhHUj1EjIWeeN/bet9HJrz9Y4WGd2MOXHL88T+cUzfHLEneYrrVe6FDbAlMpSPw4OAOAQ==
 #
 build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
 
+build.netbsd.org ssh-ed25519 C3NzaC1lZDI1NTE5ICUM7QeCYsh/mqacK2ZARQrmYtTeB+PWg5FiMruS+xhz
+
 build.netbsd.org ecdsa-sha2-nistp521 E2VjZHNhLXNoYTItbmlzdHA1MjEIbmlzdHA1MjEAAACFBAHYkX/uBJWozv+YkhVu4lvyPw8vlmD8oElKC3jNi2fWiWh+8naw7pTvscgqW5kzihSebdZ8eHnb1+oBOqgjlyaSPgFy+Jvtf2DunOrWTZ1sxSPS5c3j4A35cufNH/cYO5KbWb06h39BUi7c4iB5o0yfguNutuyBPlI9T9GKUmzU1SpfrA==
 #