CVS commit: [netbsd-7-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:55:07 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.1

Log Message:
1373, 1390


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-7.1.1

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

Modified files:

Index: src/doc/CHANGES-7.1.1
diff -u src/doc/CHANGES-7.1.1:1.1.2.7 src/doc/CHANGES-7.1.1:1.1.2.8
--- src/doc/CHANGES-7.1.1:1.1.2.7	Wed Apr 26 14:57:19 2017
+++ src/doc/CHANGES-7.1.1	Fri May 12 05:55:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.7 2017/04/26 14:57:19 martin Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.8 2017/05/12 05:55:07 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -571,3 +571,14 @@ sys/arch/amd64/amd64/trap.c			1.96
 	and treating it as a syscall.
 	[chs, ticket #1410]
 
+usr.sbin/rtadvd/config.c			1.36
+usr.sbin/rtadvd/rtadvd.h			1.15
+
+	Fix the default value of rltime.  PR bin/51994
+	[ozaki-r, ticket #1373]
+
+sbin/ping/ping.c1.116
+
+	Fix cksum calculation for clearing the cached route.
+	[ryo, ticket #1390]
+

CVS commit: [netbsd-7-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:55:07 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.1

Log Message:
1373, 1390


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-7.1.1

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

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:50:20 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
1373, 1390


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-7.0.3

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

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:50:20 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
1373, 1390


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-7.0.3

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.40 src/doc/CHANGES-7.0.3:1.1.2.41
--- src/doc/CHANGES-7.0.3:1.1.2.40	Wed Apr 26 14:58:53 2017
+++ src/doc/CHANGES-7.0.3	Fri May 12 05:50:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.40 2017/04/26 14:58:53 martin Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.41 2017/05/12 05:50:20 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -1878,3 +1878,14 @@ sys/arch/amd64/amd64/trap.c			1.96
 	and treating it as a syscall.
 	[chs, ticket #1410]
 
+usr.sbin/rtadvd/config.c			1.36
+usr.sbin/rtadvd/rtadvd.h			1.15
+
+	Fix the default value of rltime. PR bin/51994
+	[ozaki-r, ticket #1373]
+
+sbin/ping/ping.c1.116
+
+	Fix cksum calculation for clearing the cached route.
+	[ryo, ticket #1390]
+

CVS commit: src/sys/arch/arm/arm

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri May 12 05:46:39 UTC 2017

Modified Files:
src/sys/arch/arm/arm: ast.c

Log Message:
KASSERT -> MASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/arm/ast.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/arm/arm/ast.c
diff -u src/sys/arch/arm/arm/ast.c:1.28 src/sys/arch/arm/arm/ast.c:1.29
--- src/sys/arch/arm/arm/ast.c:1.28	Fri Apr 17 17:28:33 2015
+++ src/sys/arch/arm/arm/ast.c	Fri May 12 05:46:39 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.28 2015/04/17 17:28:33 matt Exp $	*/
+/*	$NetBSD: ast.c,v 1.29 2017/05/12 05:46:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.28 2015/04/17 17:28:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.29 2017/05/12 05:46:39 skrll Exp $");
 
 #include "opt_ddb.h"
 
@@ -80,7 +80,9 @@ userret(struct lwp *l)
 #ifdef __HAVE_PREEMPTION
 	kpreempt_disable();
 #endif
-	KASSERT(curcpu()->ci_pmap_cur == l->l_proc->p_vmspace->vm_map.pmap);
+	KASSERTMSG(curcpu()->ci_pmap_cur == l->l_proc->p_vmspace->vm_map.pmap,
+	"%p vs %p", curcpu()->ci_pmap_cur,
+	l->l_proc->p_vmspace->vm_map.pmap);
 	if (__predict_false(armreg_ttbcr_read() & TTBCR_S_PD0)) {
 		pmap_activate(l);
 	}

CVS commit: src/sys/arch/arm/arm

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri May 12 05:46:39 UTC 2017

Modified Files:
src/sys/arch/arm/arm: ast.c

Log Message:
KASSERT -> MASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/arm/ast.c

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

CVS commit: src/sys/uvm/pmap

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri May 12 05:45:59 UTC 2017

Modified Files:
src/sys/uvm/pmap: pmap.c

Log Message:
Sprinkle some KASSERTs


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/uvm/pmap/pmap.c

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

CVS commit: src/sys/uvm/pmap

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri May 12 05:45:59 UTC 2017

Modified Files:
src/sys/uvm/pmap: pmap.c

Log Message:
Sprinkle some KASSERTs


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/uvm/pmap/pmap.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/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.33 src/sys/uvm/pmap/pmap.c:1.34
--- src/sys/uvm/pmap/pmap.c:1.33	Sun May  7 04:15:50 2017
+++ src/sys/uvm/pmap/pmap.c	Fri May 12 05:45:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.33 2017/05/07 04:15:50 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.34 2017/05/12 05:45:58 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33 2017/05/07 04:15:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.34 2017/05/12 05:45:58 skrll Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1738,6 +1738,8 @@ pmap_pvlist_check(struct vm_page_md *mdp
 		|| VM_PAGEMD_UNCACHED_P(mdpg), "colors=%#x uncached=%u",
 		colors, VM_PAGEMD_UNCACHED_P(mdpg));
 #endif
+	} else {
+		KASSERT(pv->pv_next == NULL);
 	}
 #endif /* DEBUG */
 }
@@ -2102,6 +2104,7 @@ pmap_pv_page_free(struct pool *pp, void 
 	kpreempt_enable();
 #endif
 	pmap_page_clear_attributes(VM_PAGE_TO_MD(pg), VM_PAGEMD_POOLPAGE);
+	KASSERT(!VM_PAGEMD_EXECPAGE_P(VM_PAGE_TO_MD(pg)));
 	uvm_pagefree(pg);
 }
 
@@ -2139,7 +2142,10 @@ pmap_map_poolpage(paddr_t pa)
 {
 	struct vm_page * const pg = PHYS_TO_VM_PAGE(pa);
 	KASSERT(pg);
+
 	struct vm_page_md * const mdpg = VM_PAGE_TO_MD(pg);
+	KASSERT(!VM_PAGEMD_EXECPAGE_P(mdpg));
+
 	pmap_page_set_attributes(mdpg, VM_PAGEMD_POOLPAGE);
 
 	return pmap_md_map_poolpage(pa, NBPG);
@@ -2153,6 +2159,8 @@ pmap_unmap_poolpage(vaddr_t va)
 
 	struct vm_page * const pg = PHYS_TO_VM_PAGE(pa);
 	KASSERT(pg != NULL);
+	KASSERT(!VM_PAGEMD_EXECPAGE_P(VM_PAGE_TO_MD(pg)));
+
 	pmap_page_clear_attributes(VM_PAGE_TO_MD(pg), VM_PAGEMD_POOLPAGE);
 	pmap_md_unmap_poolpage(va, NBPG);
 

CVS commit: [netbsd-7] src/sys

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:44:10 UTC 2017

Modified Files:
src/sys/net [netbsd-7]: route.c
src/sys/netinet [netbsd-7]: ip_flow.c
src/sys/netinet6 [netbsd-7]: ip6_flow.c nd6.c

Log Message:
Pull up following revision(s) (requested by skrll/ozaki-r in ticket #1402):
sys/net/route.c: revision 1.170 via patch
sys/netinet/ip_flow.c: revision 1.73 via patch
sys/netinet6/ip6_flow.c: revision 1.28 via patch
sys/netinet6/nd6.c: revision 1.203 via patch
Run timers in workqueue
Timers (such as nd6_timer) typically free/destroy some data in callout
(softint). If we apply psz/psref for such data, we cannot do free/destroy
process in there because synchronization of psz/psref cannot be used in
softint. So run timer callbacks in workqueue works (normal LWP context).
Doing workqueue_enqueue a work twice (i.e., call workqueue_enqueue before
a previous task is scheduled) isn't allowed. For nd6_timer and
rt_timer_timer, this doesn't happen because callout_reset is called only
from workqueue's work. OTOH, ip{,6}flow_slowtimo's callout can be called
before its work starts and completes because the callout is periodically
called regardless of completion of the work. To avoid such a situation,
add a flag for each protocol; the flag is set true when a work is
enqueued and set false after the work finished. workqueue_enqueue is
called only if the flag is false.
Proposed on tech-net and tech-kern.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.132.2.1 src/sys/net/route.c
cvs rdiff -u -r1.64 -r1.64.2.1 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.152.2.3 -r1.152.2.4 src/sys/netinet6/nd6.c

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

Modified files:

Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.132 src/sys/net/route.c:1.132.2.1
--- src/sys/net/route.c:1.132	Fri Jun  6 01:27:32 2014
+++ src/sys/net/route.c	Fri May 12 05:44:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.132 2014/06/06 01:27:32 rmind Exp $	*/
+/*	$NetBSD: route.c,v 1.132.2.1 2017/05/12 05:44:10 snj Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
 #include "opt_route.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.132 2014/06/06 01:27:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.132.2.1 2017/05/12 05:44:10 snj Exp $");
 
 #include 
 #include 
@@ -110,6 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: route.c,v 1.
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -133,6 +134,8 @@ struct pool rtentry_pool;
 struct pool rttimer_pool;
 
 struct callout rt_timer_ch; /* callout for rt_timer_timer() */
+struct workqueue	*rt_timer_wq;
+struct work		rt_timer_wk;
 
 #ifdef RTFLUSH_DEBUG
 static int _rtcache_debug = 0;
@@ -1031,14 +1034,22 @@ static int rt_init_done = 0;
  * that this is run when the first queue is added...
  */
 
+static void rt_timer_work(struct work *, void *);
+
 void
 rt_timer_init(void)
 {
+	int error;
+
 	assert(rt_init_done == 0);
 
 	LIST_INIT(_queue_head);
 	callout_init(_timer_ch, 0);
 	callout_reset(_timer_ch, hz, rt_timer_timer, NULL);
+	error = workqueue_create(_timer_wq, "rt_timer",
+	rt_timer_work, NULL, PRI_SOFTNET, IPL_SOFTNET, WQ_MPSAFE);
+	if (error)
+		panic("%s: workqueue_create failed (%d)\n", __func__, error);
 	rt_init_done = 1;
 }
 
@@ -1171,9 +1182,8 @@ rt_timer_add(struct rtentry *rt,
 	return 0;
 }
 
-/* ARGSUSED */
-void
-rt_timer_timer(void *arg)
+static void
+rt_timer_work(struct work *wk, void *arg)
 {
 	struct rttimer_queue *rtq;
 	struct rttimer *r;
@@ -1198,6 +1208,13 @@ rt_timer_timer(void *arg)
 	callout_reset(_timer_ch, hz, rt_timer_timer, NULL);
 }
 
+void
+rt_timer_timer(void *arg)
+{
+
+	workqueue_enqueue(rt_timer_wq, _timer_wk, NULL);
+}
+
 static struct rtentry *
 _rtcache_init(struct route *ro, int flag)
 {

Index: src/sys/netinet/ip_flow.c
diff -u src/sys/netinet/ip_flow.c:1.64 src/sys/netinet/ip_flow.c:1.64.2.1
--- src/sys/netinet/ip_flow.c:1.64	Thu May 22 22:01:12 2014
+++ src/sys/netinet/ip_flow.c	Fri May 12 05:44:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_flow.c,v 1.64 2014/05/22 22:01:12 rmind Exp $	*/
+/*	$NetBSD: ip_flow.c,v 1.64.2.1 2017/05/12 05:44:10 snj Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.64 2014/05/22 22:01:12 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.64.2.1 2017/05/12 05:44:10 snj Exp $");
 
 #include 
 #include 
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -96,6 +97,10 @@ static int ip_hashsize = IPFLOW_DEFAULT_
 
 static void ipflow_sysctl_init(struct sysctllog **);
 
+static void ipflow_slowtimo_work(struct work *, void *);
+static struct workqueue	*ipflow_slowtimo_wq;

CVS commit: [netbsd-7] src/sys

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:44:10 UTC 2017

Modified Files:
src/sys/net [netbsd-7]: route.c
src/sys/netinet [netbsd-7]: ip_flow.c
src/sys/netinet6 [netbsd-7]: ip6_flow.c nd6.c

Log Message:
Pull up following revision(s) (requested by skrll/ozaki-r in ticket #1402):
sys/net/route.c: revision 1.170 via patch
sys/netinet/ip_flow.c: revision 1.73 via patch
sys/netinet6/ip6_flow.c: revision 1.28 via patch
sys/netinet6/nd6.c: revision 1.203 via patch
Run timers in workqueue
Timers (such as nd6_timer) typically free/destroy some data in callout
(softint). If we apply psz/psref for such data, we cannot do free/destroy
process in there because synchronization of psz/psref cannot be used in
softint. So run timer callbacks in workqueue works (normal LWP context).
Doing workqueue_enqueue a work twice (i.e., call workqueue_enqueue before
a previous task is scheduled) isn't allowed. For nd6_timer and
rt_timer_timer, this doesn't happen because callout_reset is called only
from workqueue's work. OTOH, ip{,6}flow_slowtimo's callout can be called
before its work starts and completes because the callout is periodically
called regardless of completion of the work. To avoid such a situation,
add a flag for each protocol; the flag is set true when a work is
enqueued and set false after the work finished. workqueue_enqueue is
called only if the flag is false.
Proposed on tech-net and tech-kern.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.132.2.1 src/sys/net/route.c
cvs rdiff -u -r1.64 -r1.64.2.1 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.152.2.3 -r1.152.2.4 src/sys/netinet6/nd6.c

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

CVS commit: [netbsd-7] src/sbin/luactl

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:33:37 UTC 2017

Modified Files:
src/sbin/luactl [netbsd-7]: luactl.8

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1401):
sbin/luactl/luactl.8: revision 1.7
Direct reader to intro(9lua), lua(9) does not exist.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/sbin/luactl/luactl.8

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

Modified files:

Index: src/sbin/luactl/luactl.8
diff -u src/sbin/luactl/luactl.8:1.4 src/sbin/luactl/luactl.8:1.4.6.1
--- src/sbin/luactl/luactl.8:1.4	Thu Oct 17 09:44:22 2013
+++ src/sbin/luactl/luactl.8	Fri May 12 05:33:37 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: luactl.8,v 1.4 2013/10/17 09:44:22 wiz Exp $
+.\" $NetBSD: luactl.8,v 1.4.6.1 2017/05/12 05:33:37 snj Exp $
 .\"
 .\" Copyright (c) 2011, 2013 Marc Balmer 
 .\"
@@ -14,7 +14,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 17, 2013
+.Dd April 10, 2017
 .Dt LUACTL 8
 .Os
 .Sh NAME
@@ -114,7 +114,7 @@ Lua device file.
 .Xr module 7 ,
 .Xr modload 8 ,
 .Xr modunload 8 ,
-.Xr lua 9
+.Xr intro 9lua
 .Sh HISTORY
 The
 .Nm

CVS commit: [netbsd-7] src/sbin/luactl

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:33:37 UTC 2017

Modified Files:
src/sbin/luactl [netbsd-7]: luactl.8

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1401):
sbin/luactl/luactl.8: revision 1.7
Direct reader to intro(9lua), lua(9) does not exist.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/sbin/luactl/luactl.8

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

CVS commit: [netbsd-7] src/sys/net/npf

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:32:12 UTC 2017

Modified Files:
src/sys/net/npf [netbsd-7]: npf_inet.c npf_mbuf.c npf_nat.c

Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1394):
sys/net/npf/npf_inet.c: revisions 1.34, 1.35 via patch
sys/net/npf/npf_mbuf.c: revision 1.16
sys/net/npf/npf_nat.c: revision 1.40
minimal changes necessary to link into an INET6-less kernel.
--
fixup misplaced #endif


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/net/npf/npf_inet.c
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/net/npf/npf_mbuf.c
cvs rdiff -u -r1.32.2.5 -r1.32.2.6 src/sys/net/npf/npf_nat.c

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

Modified files:

Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.32 src/sys/net/npf/npf_inet.c:1.32.2.1
--- src/sys/net/npf/npf_inet.c:1.32	Sun Jul 20 00:37:41 2014
+++ src/sys/net/npf/npf_inet.c	Fri May 12 05:32:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_inet.c,v 1.32 2014/07/20 00:37:41 rmind Exp $	*/
+/*	$NetBSD: npf_inet.c,v 1.32.2.1 2017/05/12 05:32:12 snj Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.32 2014/07/20 00:37:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.32.2.1 2017/05/12 05:32:12 snj Exp $");
 
 #include 
 #include 
@@ -654,7 +654,9 @@ npf_napt_rwr(const npf_cache_t *npc, u_i
 		}
 		break;
 	case IPPROTO_ICMP:
+#ifdef INET6
 	case IPPROTO_ICMPV6:
+#endif
 		KASSERT(npf_iscached(npc, NPC_ICMP));
 		/* Nothing. */
 		break;
@@ -668,6 +670,7 @@ npf_napt_rwr(const npf_cache_t *npc, u_i
  * IPv6-to-IPv6 Network Prefix Translation (NPTv6), as per RFC 6296.
  */
 
+#ifdef INET6
 int
 npf_npt66_rwr(const npf_cache_t *npc, u_int which, const npf_addr_t *pref,
 npf_netmask_t len, uint16_t adj)
@@ -736,18 +739,25 @@ npf_npt66_rwr(const npf_cache_t *npc, u_
 	addr->s6_addr16[word] = sum;
 	return 0;
 }
+#endif
 
 #if defined(DDB) || defined(_NPF_TESTING)
 
 const char *
 npf_addr_dump(const npf_addr_t *addr, int alen)
 {
+#ifdef INET6
 	if (alen == sizeof(struct in_addr)) {
+#else
+		KASSERT(alen == sizeof(struct in_addr));
+#endif
 		struct in_addr ip;
 		memcpy(, addr, alen);
 		return inet_ntoa(ip);
+#ifdef INET6
 	}
-	return "[IPv6]"; // XXX
+	return ip6_sprintf(addr);
+#endif
 }
 
 #endif

Index: src/sys/net/npf/npf_mbuf.c
diff -u src/sys/net/npf/npf_mbuf.c:1.13.2.2 src/sys/net/npf/npf_mbuf.c:1.13.2.3
--- src/sys/net/npf/npf_mbuf.c:1.13.2.2	Tue Jan 26 01:27:21 2016
+++ src/sys/net/npf/npf_mbuf.c	Fri May 12 05:32:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_mbuf.c,v 1.13.2.2 2016/01/26 01:27:21 riz Exp $	*/
+/*	$NetBSD: npf_mbuf.c,v 1.13.2.3 2017/05/12 05:32:12 snj Exp $	*/
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.13.2.2 2016/01/26 01:27:21 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.13.2.3 2017/05/12 05:32:12 snj Exp $");
 
 #include 
 #include 
@@ -258,11 +258,13 @@ nbuf_cksum_barrier(nbuf_t *nbuf, int di)
 		m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv4 | M_CSUM_UDPv4);
 		return true;
 	}
+#ifdef INET6
 	if (m->m_pkthdr.csum_flags & (M_CSUM_TCPv6 | M_CSUM_UDPv6)) {
 		in6_delayed_cksum(m);
 		m->m_pkthdr.csum_flags &= ~(M_CSUM_TCPv6 | M_CSUM_UDPv6);
 		return true;
 	}
+#endif
 	return false;
 }
 

Index: src/sys/net/npf/npf_nat.c
diff -u src/sys/net/npf/npf_nat.c:1.32.2.5 src/sys/net/npf/npf_nat.c:1.32.2.6
--- src/sys/net/npf/npf_nat.c:1.32.2.5	Sun Jan  4 11:37:38 2015
+++ src/sys/net/npf/npf_nat.c	Fri May 12 05:32:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_nat.c,v 1.32.2.5 2015/01/04 11:37:38 martin Exp $	*/
+/*	$NetBSD: npf_nat.c,v 1.32.2.6 2017/05/12 05:32:12 snj Exp $	*/
 
 /*-
  * Copyright (c) 2014 Mindaugas Rasiukevicius 
@@ -71,7 +71,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.32.2.5 2015/01/04 11:37:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.32.2.6 2017/05/12 05:32:12 snj Exp $");
 
 #include 
 #include 
@@ -657,10 +657,12 @@ npf_nat_algo(npf_cache_t *npc, const npf
 	int error;
 
 	switch (np->n_algo) {
+#ifdef INET6
 	case NPF_ALGO_NPT66:
 		error = npf_npt66_rwr(npc, which, >n_taddr,
 		np->n_tmask, np->n_npt66_adj);
 		break;
+#endif
 	default:
 		error = npf_napt_rwr(npc, which, >n_taddr, np->n_tport);
 		break;

CVS commit: [netbsd-7] src/sys/net/npf

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:32:12 UTC 2017

Modified Files:
src/sys/net/npf [netbsd-7]: npf_inet.c npf_mbuf.c npf_nat.c

Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1394):
sys/net/npf/npf_inet.c: revisions 1.34, 1.35 via patch
sys/net/npf/npf_mbuf.c: revision 1.16
sys/net/npf/npf_nat.c: revision 1.40
minimal changes necessary to link into an INET6-less kernel.
--
fixup misplaced #endif


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/net/npf/npf_inet.c
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/net/npf/npf_mbuf.c
cvs rdiff -u -r1.32.2.5 -r1.32.2.6 src/sys/net/npf/npf_nat.c

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

CVS commit: [netbsd-7] src/share/misc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:28:23 UTC 2017

Modified Files:
src/share/misc [netbsd-7]: bsd-family-tree

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1392):
share/misc/bsd-family-tree: revision 1.59
Sync with r316082 from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.56.2.1 -r1.56.2.2 src/share/misc/bsd-family-tree

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

Modified files:

Index: src/share/misc/bsd-family-tree
diff -u src/share/misc/bsd-family-tree:1.56.2.1 src/share/misc/bsd-family-tree:1.56.2.2
--- src/share/misc/bsd-family-tree:1.56.2.1	Sun Dec 18 07:12:06 2016
+++ src/share/misc/bsd-family-tree	Fri May 12 05:28:23 2017
@@ -176,7 +176,7 @@ FreeBSD 4.0  |  |  |  |  | NetBSD 1.
  ||  | |  \
 FreeBSD 5.0   |  | |   |
  ||  | |   |
-FreeBSD 5.1   |  | | DragonFly 1.0
+FreeBSD 5.1   |  | |DragonFly 1.0
  |  \ |  | |   |
  |   - Mac OS X  | |   |
  |   10.3| |   |
@@ -187,7 +187,7 @@ FreeBSD 5.2   |  |  
  *---FreeBSD 5.3  |  | |   |
  |   ||  | OpenBSD 3.6 |
  |   ||   NetBSD 2.0   |   |
- |   ||  | |  ||DragonFly 1.2.0
+ |   ||  | |  ||   DragonFly 1.2.0
  |   | Mac OS X  | | NetBSD 2.0.2  |   |
  |   |   10.4| |  ||   |
  |   FreeBSD 5.4  |  | |  ||   |
@@ -200,50 +200,50 @@ FreeBSD 5.2   |  |  
  | | ||  | NetBSD 2.1  |   |
  | | ||  | |   |
  | | ||   NetBSD 3.0   |   |
- | | ||  | |  ||DragonFly 1.4.0
+ | | ||  | |  ||   DragonFly 1.4.0
  | | ||  | |  |OpenBSD 3.9 |
  |  FreeBSD  ||  | |  ||   |
  |6.1||  | |  ||   |
  | |  FreeBSD 5.5 |  | |  ||   |
- | |  |  | | NetBSD 3.0.1  |DragonFly 1.6.0
+ | |  |  | | NetBSD 3.0.1  |   DragonFly 1.6.0
  | |  |  | |  ||   |
  | |  |  | |  |OpenBSD 4.0 |
  | |  |  | | NetBSD 3.0.2  |   |
  | |  |  | NetBSD 3.1  |   |
  | FreeBSD 6.2|  | |   |
- | |  |  | |DragonFly 1.8.0
+ | |  |  | |   DragonFly 1.8.0
  | |  |  | OpenBSD 4.1 |
- | |  |  | |DragonFly 1.10.0
+ | |  |  | |   DragonFly 1.10.0
  | |   Mac OS X  | |   |
  | | 10.5| |   |
  | |  |  | OpenBSD 4.2 |
  | |  |   NetBSD 4.0   |   |
  | FreeBSD 6.3|  |||   |
  |\   |  |||   |
- *--FreeBSD|  |  |||DragonFly 1.12.0
+ *--FreeBSD|  |  |||   DragonFly 1.12.0
  |7.0  |  |  |||   |
  | |   |  |  ||OpenBSD 4.3 |
- | |   |  |  | NetBSD  |DragonFly 2.0.0
+ | |   |  |  | NetBSD  |   DragonFly 2.0.0
  | |FreeBSD   |  |  4.0.1  OpenBSD 4.4 |
  | |  6.4 |  | |   |
  | |  |  | |   |
  |  FreeBSD 7.1   |  | |

CVS commit: [netbsd-7] src/share/misc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:28:23 UTC 2017

Modified Files:
src/share/misc [netbsd-7]: bsd-family-tree

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1392):
share/misc/bsd-family-tree: revision 1.59
Sync with r316082 from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.56.2.1 -r1.56.2.2 src/share/misc/bsd-family-tree

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

CVS commit: [netbsd-7-0] src/sbin/ping

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:21:43 UTC 2017

Modified Files:
src/sbin/ping [netbsd-7-0]: ping.c

Log Message:
Pull up following revision(s) (requested by ryo in ticket #1390):
sbin/ping/ping.c: revision 1.116
Fix cksum calculation for clearing the cached route.
In ping.c:r1.104, the size of echoreply packet was changed to ICMP_MINLEN,
Therefore also calculation size must be ICMP_MINLEN.


To generate a diff of this commit:
cvs rdiff -u -r1.107.4.1.2.1 -r1.107.4.1.2.2 src/sbin/ping/ping.c

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

CVS commit: [netbsd-7-0] src/sbin/ping

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:21:43 UTC 2017

Modified Files:
src/sbin/ping [netbsd-7-0]: ping.c

Log Message:
Pull up following revision(s) (requested by ryo in ticket #1390):
sbin/ping/ping.c: revision 1.116
Fix cksum calculation for clearing the cached route.
In ping.c:r1.104, the size of echoreply packet was changed to ICMP_MINLEN,
Therefore also calculation size must be ICMP_MINLEN.


To generate a diff of this commit:
cvs rdiff -u -r1.107.4.1.2.1 -r1.107.4.1.2.2 src/sbin/ping/ping.c

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

Modified files:

Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.107.4.1.2.1 src/sbin/ping/ping.c:1.107.4.1.2.2
--- src/sbin/ping/ping.c:1.107.4.1.2.1	Sun Dec 18 08:40:54 2016
+++ src/sbin/ping/ping.c	Fri May 12 05:21:43 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ping.c,v 1.107.4.1.2.1 2016/12/18 08:40:54 snj Exp $	*/
+/*	$NetBSD: ping.c,v 1.107.4.1.2.2 2017/05/12 05:21:43 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.107.4.1.2.1 2016/12/18 08:40:54 snj Exp $");
+__RCSID("$NetBSD: ping.c,v 1.107.4.1.2.2 2017/05/12 05:21:43 snj Exp $");
 #endif
 
 #include 
@@ -883,7 +883,7 @@ pinger(void)
 		opack_icmp.icmp_id = ~ident;
 		opack_icmp.icmp_cksum = 0;
 		opack_icmp.icmp_cksum = in_cksum((u_int16_t *)_icmp,
-		phdrlen);
+		ICMP_MINLEN);
 		sw = 0;
 		if (prog_setsockopt(sloop, IPPROTO_IP, IP_HDRINCL,
 			   (char *), sizeof(sw)) < 0)

CVS commit: [netbsd-7-1] src/sbin/ping

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:21:01 UTC 2017

Modified Files:
src/sbin/ping [netbsd-7-1]: ping.c

Log Message:
Pull up following revision(s) (requested by ryo in ticket #1390):
sbin/ping/ping.c: revision 1.116
Fix cksum calculation for clearing the cached route.
In ping.c:r1.104, the size of echoreply packet was changed to ICMP_MINLEN,
Therefore also calculation size must be ICMP_MINLEN.


To generate a diff of this commit:
cvs rdiff -u -r1.107.4.2 -r1.107.4.2.2.1 src/sbin/ping/ping.c

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

Modified files:

Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.107.4.2 src/sbin/ping/ping.c:1.107.4.2.2.1
--- src/sbin/ping/ping.c:1.107.4.2	Sun Dec 18 08:22:28 2016
+++ src/sbin/ping/ping.c	Fri May 12 05:21:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ping.c,v 1.107.4.2 2016/12/18 08:22:28 snj Exp $	*/
+/*	$NetBSD: ping.c,v 1.107.4.2.2.1 2017/05/12 05:21:01 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.107.4.2 2016/12/18 08:22:28 snj Exp $");
+__RCSID("$NetBSD: ping.c,v 1.107.4.2.2.1 2017/05/12 05:21:01 snj Exp $");
 #endif
 
 #include 
@@ -883,7 +883,7 @@ pinger(void)
 		opack_icmp.icmp_id = ~ident;
 		opack_icmp.icmp_cksum = 0;
 		opack_icmp.icmp_cksum = in_cksum((u_int16_t *)_icmp,
-		phdrlen);
+		ICMP_MINLEN);
 		sw = 0;
 		if (prog_setsockopt(sloop, IPPROTO_IP, IP_HDRINCL,
 			   (char *), sizeof(sw)) < 0)

CVS commit: [netbsd-7-1] src/sbin/ping

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:21:01 UTC 2017

Modified Files:
src/sbin/ping [netbsd-7-1]: ping.c

Log Message:
Pull up following revision(s) (requested by ryo in ticket #1390):
sbin/ping/ping.c: revision 1.116
Fix cksum calculation for clearing the cached route.
In ping.c:r1.104, the size of echoreply packet was changed to ICMP_MINLEN,
Therefore also calculation size must be ICMP_MINLEN.


To generate a diff of this commit:
cvs rdiff -u -r1.107.4.2 -r1.107.4.2.2.1 src/sbin/ping/ping.c

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

CVS commit: [netbsd-7] src/sbin/ping

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:20:27 UTC 2017

Modified Files:
src/sbin/ping [netbsd-7]: ping.c

Log Message:
Pull up following revision(s) (requested by ryo in ticket #1390):
sbin/ping/ping.c: revision 1.116
Fix cksum calculation for clearing the cached route.
In ping.c:r1.104, the size of echoreply packet was changed to ICMP_MINLEN,
Therefore also calculation size must be ICMP_MINLEN.


To generate a diff of this commit:
cvs rdiff -u -r1.107.4.2 -r1.107.4.3 src/sbin/ping/ping.c

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

Modified files:

Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.107.4.2 src/sbin/ping/ping.c:1.107.4.3
--- src/sbin/ping/ping.c:1.107.4.2	Sun Dec 18 08:22:28 2016
+++ src/sbin/ping/ping.c	Fri May 12 05:20:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ping.c,v 1.107.4.2 2016/12/18 08:22:28 snj Exp $	*/
+/*	$NetBSD: ping.c,v 1.107.4.3 2017/05/12 05:20:27 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.107.4.2 2016/12/18 08:22:28 snj Exp $");
+__RCSID("$NetBSD: ping.c,v 1.107.4.3 2017/05/12 05:20:27 snj Exp $");
 #endif
 
 #include 
@@ -883,7 +883,7 @@ pinger(void)
 		opack_icmp.icmp_id = ~ident;
 		opack_icmp.icmp_cksum = 0;
 		opack_icmp.icmp_cksum = in_cksum((u_int16_t *)_icmp,
-		phdrlen);
+		ICMP_MINLEN);
 		sw = 0;
 		if (prog_setsockopt(sloop, IPPROTO_IP, IP_HDRINCL,
 			   (char *), sizeof(sw)) < 0)

CVS commit: [netbsd-7] src/sbin/ping

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:20:27 UTC 2017

Modified Files:
src/sbin/ping [netbsd-7]: ping.c

Log Message:
Pull up following revision(s) (requested by ryo in ticket #1390):
sbin/ping/ping.c: revision 1.116
Fix cksum calculation for clearing the cached route.
In ping.c:r1.104, the size of echoreply packet was changed to ICMP_MINLEN,
Therefore also calculation size must be ICMP_MINLEN.


To generate a diff of this commit:
cvs rdiff -u -r1.107.4.2 -r1.107.4.3 src/sbin/ping/ping.c

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

CVS commit: [netbsd-7] src/sys/arch/arm/omap

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:17:40 UTC 2017

Modified Files:
src/sys/arch/arm/omap [netbsd-7]: omap_edma.c

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1387):
sys/arch/arm/omap/omap_edma.c: revision 1.4 via patch
PR/51380: Mutex error: mutex_vector_enter: locking against myself
Change the interrupt handler IPL level to IPL_VM (aka IPL_BIO aka
IPL_SDMMC) so that the sdhc_host_lock prevents edma_intr from running


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/omap/omap_edma.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/arm/omap/omap_edma.c
diff -u src/sys/arch/arm/omap/omap_edma.c:1.1.2.2 src/sys/arch/arm/omap/omap_edma.c:1.1.2.3
--- src/sys/arch/arm/omap/omap_edma.c:1.1.2.2	Sun Apr 19 04:37:17 2015
+++ src/sys/arch/arm/omap/omap_edma.c	Fri May 12 05:17:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_edma.c,v 1.1.2.2 2015/04/19 04:37:17 msaitoh Exp $ */
+/* $NetBSD: omap_edma.c,v 1.1.2.3 2017/05/12 05:17:40 snj Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill 
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap_edma.c,v 1.1.2.2 2015/04/19 04:37:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_edma.c,v 1.1.2.3 2017/05/12 05:17:40 snj Exp $");
 
 #include "opt_omap.h"
 
@@ -141,7 +141,7 @@ edma_attach(device_t parent, device_t se
 
 	sc->sc_dev = self;
 	sc->sc_iot = obio->obio_iot;
-	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_SCHED);
+   mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_VM);
 	if (bus_space_map(obio->obio_iot, obio->obio_addr, obio->obio_size,
 	0, >sc_ioh) != 0) {
 		aprint_error(": couldn't map address spcae\n");
@@ -164,13 +164,13 @@ edma_attach(device_t parent, device_t se
 	edma_init(sc);
 
 	sc->sc_ih = intr_establish(obio->obio_intrbase + 0,
-	IPL_SCHED, IST_LEVEL, edma_intr, sc);
+   IPL_VM, IST_LEVEL | IST_MPSAFE, edma_intr, sc);
 	KASSERT(sc->sc_ih != NULL);
 
 	sc->sc_mperr_ih = intr_establish(obio->obio_intrbase + 1,
-	IPL_SCHED, IST_LEVEL, edma_mperr_intr, sc);
+   IPL_VM, IST_LEVEL, edma_mperr_intr, sc);
 	sc->sc_errint_ih = intr_establish(obio->obio_intrbase + 2,
-	IPL_SCHED, IST_LEVEL, edma_errint_intr, sc);
+   IPL_VM, IST_LEVEL, edma_errint_intr, sc);
 }
 
 /*

CVS commit: [netbsd-7] src/sys/arch/arm/omap

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:17:40 UTC 2017

Modified Files:
src/sys/arch/arm/omap [netbsd-7]: omap_edma.c

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1387):
sys/arch/arm/omap/omap_edma.c: revision 1.4 via patch
PR/51380: Mutex error: mutex_vector_enter: locking against myself
Change the interrupt handler IPL level to IPL_VM (aka IPL_BIO aka
IPL_SDMMC) so that the sdhc_host_lock prevents edma_intr from running


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/omap/omap_edma.c

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

CVS commit: [netbsd-7] src/distrib/utils/embedded

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:12:59 UTC 2017

Modified Files:
src/distrib/utils/embedded [netbsd-7]: mkimage

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1386):
distrib/utils/embedded/mkimage: revision 1.62
Mark the msdos parition active for boards like the BeagleBone Black


To generate a diff of this commit:
cvs rdiff -u -r1.48.4.6 -r1.48.4.7 src/distrib/utils/embedded/mkimage

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

CVS commit: [netbsd-7] src/distrib/utils/embedded

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:12:59 UTC 2017

Modified Files:
src/distrib/utils/embedded [netbsd-7]: mkimage

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1386):
distrib/utils/embedded/mkimage: revision 1.62
Mark the msdos parition active for boards like the BeagleBone Black


To generate a diff of this commit:
cvs rdiff -u -r1.48.4.6 -r1.48.4.7 src/distrib/utils/embedded/mkimage

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

Modified files:

Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.48.4.6 src/distrib/utils/embedded/mkimage:1.48.4.7
--- src/distrib/utils/embedded/mkimage:1.48.4.6	Thu Aug  6 21:13:43 2015
+++ src/distrib/utils/embedded/mkimage	Fri May 12 05:12:58 2017
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.48.4.6 2015/08/06 21:13:43 snj Exp $
+# $NetBSD: mkimage,v 1.48.4.7 2017/05/12 05:12:58 snj Exp $
 #
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -218,7 +218,7 @@ if [ -n "${msdosid}" ]; then
 	echo ${bar} Running fdisk ${bar}
 	initsecs=$((${init} * 1024))
 	bootsecs=$((${boot} * 1024))
-	${FDISK} -f -u -0 -s ${msdosid}/${initsecs}/${bootsecs} -F ${image}
+	${FDISK} -f -a -u -0 -s ${msdosid}/${initsecs}/${bootsecs} -F ${image}
 elif [ -n "${netbsdid}" ]; then
 	echo ${bar} Running fdisk ${bar}
 	${FDISK} -f -i ${image}

CVS commit: [netbsd-7-0] src/usr.sbin/rtadvd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:09:47 UTC 2017

Modified Files:
src/usr.sbin/rtadvd [netbsd-7-0]: config.c rtadvd.h

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1373):
usr.sbin/rtadvd/config.c: revision 1.36
usr.sbin/rtadvd/rtadvd.h: revision 1.15
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.10.1 src/usr.sbin/rtadvd/config.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/usr.sbin/rtadvd/rtadvd.h

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

CVS commit: [netbsd-7-0] src/usr.sbin/rtadvd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:09:47 UTC 2017

Modified Files:
src/usr.sbin/rtadvd [netbsd-7-0]: config.c rtadvd.h

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1373):
usr.sbin/rtadvd/config.c: revision 1.36
usr.sbin/rtadvd/rtadvd.h: revision 1.15
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.10.1 src/usr.sbin/rtadvd/config.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/usr.sbin/rtadvd/rtadvd.h

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

Modified files:

Index: src/usr.sbin/rtadvd/config.c
diff -u src/usr.sbin/rtadvd/config.c:1.33 src/usr.sbin/rtadvd/config.c:1.33.10.1
--- src/usr.sbin/rtadvd/config.c:1.33	Thu Jan 24 19:55:28 2013
+++ src/usr.sbin/rtadvd/config.c	Fri May 12 05:09:47 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.c,v 1.33 2013/01/24 19:55:28 christos Exp $	*/
+/*	$NetBSD: config.c,v 1.33.10.1 2017/05/12 05:09:47 snj Exp $	*/
 /*	$KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $	*/
 
 /*
@@ -304,7 +304,7 @@ getconfig(const char *intface, int exith
 		goto errexit;
 	}
 
-	MAYHAVE(val, "rltime", tmp->maxinterval * 3);
+	MAYHAVE(val, "rltime", DEF_ADVROUTERLIFETIME);
 	if (val && (val < tmp->maxinterval || val > MAXROUTERLIFETIME)) {
 		syslog(LOG_ERR,
 		   "<%s> router lifetime (%d) on %s is invalid "

Index: src/usr.sbin/rtadvd/rtadvd.h
diff -u src/usr.sbin/rtadvd/rtadvd.h:1.13 src/usr.sbin/rtadvd/rtadvd.h:1.13.8.1
--- src/usr.sbin/rtadvd/rtadvd.h:1.13	Tue Jul  9 09:34:59 2013
+++ src/usr.sbin/rtadvd/rtadvd.h	Fri May 12 05:09:47 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtadvd.h,v 1.13 2013/07/09 09:34:59 roy Exp $	*/
+/*	$NetBSD: rtadvd.h,v 1.13.8.1 2017/05/12 05:09:47 snj Exp $	*/
 /*	$KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $	*/
 
 /*
@@ -52,6 +52,7 @@ extern struct sockaddr_in6 sin6_siteloca
 #define DEF_ADVCURHOPLIMIT 64
 #define DEF_ADVVALIDLIFETIME 2592000
 #define DEF_ADVPREFERREDLIFETIME 604800
+#define DEF_ADVROUTERLIFETIME 1800
 
 #define MAXROUTERLIFETIME 9000
 #define MIN_MAXINTERVAL 4

CVS commit: [netbsd-7-1] src/usr.sbin/rtadvd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:08:00 UTC 2017

Modified Files:
src/usr.sbin/rtadvd [netbsd-7-1]: config.c rtadvd.h

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1373):
usr.sbin/rtadvd/config.c: revision 1.36
usr.sbin/rtadvd/rtadvd.h: revision 1.15
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.14.1 src/usr.sbin/rtadvd/config.c
cvs rdiff -u -r1.13 -r1.13.12.1 src/usr.sbin/rtadvd/rtadvd.h

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

CVS commit: [netbsd-7-1] src/usr.sbin/rtadvd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:08:00 UTC 2017

Modified Files:
src/usr.sbin/rtadvd [netbsd-7-1]: config.c rtadvd.h

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1373):
usr.sbin/rtadvd/config.c: revision 1.36
usr.sbin/rtadvd/rtadvd.h: revision 1.15
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.14.1 src/usr.sbin/rtadvd/config.c
cvs rdiff -u -r1.13 -r1.13.12.1 src/usr.sbin/rtadvd/rtadvd.h

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

Modified files:

Index: src/usr.sbin/rtadvd/config.c
diff -u src/usr.sbin/rtadvd/config.c:1.33 src/usr.sbin/rtadvd/config.c:1.33.14.1
--- src/usr.sbin/rtadvd/config.c:1.33	Thu Jan 24 19:55:28 2013
+++ src/usr.sbin/rtadvd/config.c	Fri May 12 05:08:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.c,v 1.33 2013/01/24 19:55:28 christos Exp $	*/
+/*	$NetBSD: config.c,v 1.33.14.1 2017/05/12 05:08:00 snj Exp $	*/
 /*	$KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $	*/
 
 /*
@@ -304,7 +304,7 @@ getconfig(const char *intface, int exith
 		goto errexit;
 	}
 
-	MAYHAVE(val, "rltime", tmp->maxinterval * 3);
+	MAYHAVE(val, "rltime", DEF_ADVROUTERLIFETIME);
 	if (val && (val < tmp->maxinterval || val > MAXROUTERLIFETIME)) {
 		syslog(LOG_ERR,
 		   "<%s> router lifetime (%d) on %s is invalid "

Index: src/usr.sbin/rtadvd/rtadvd.h
diff -u src/usr.sbin/rtadvd/rtadvd.h:1.13 src/usr.sbin/rtadvd/rtadvd.h:1.13.12.1
--- src/usr.sbin/rtadvd/rtadvd.h:1.13	Tue Jul  9 09:34:59 2013
+++ src/usr.sbin/rtadvd/rtadvd.h	Fri May 12 05:08:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtadvd.h,v 1.13 2013/07/09 09:34:59 roy Exp $	*/
+/*	$NetBSD: rtadvd.h,v 1.13.12.1 2017/05/12 05:08:00 snj Exp $	*/
 /*	$KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $	*/
 
 /*
@@ -52,6 +52,7 @@ extern struct sockaddr_in6 sin6_siteloca
 #define DEF_ADVCURHOPLIMIT 64
 #define DEF_ADVVALIDLIFETIME 2592000
 #define DEF_ADVPREFERREDLIFETIME 604800
+#define DEF_ADVROUTERLIFETIME 1800
 
 #define MAXROUTERLIFETIME 9000
 #define MIN_MAXINTERVAL 4

CVS commit: [netbsd-7] src/usr.sbin/rtadvd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:05:17 UTC 2017

Modified Files:
src/usr.sbin/rtadvd [netbsd-7]: config.c rtadvd.h

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1373):
usr.sbin/rtadvd/config.c: revision 1.36
usr.sbin/rtadvd/rtadvd.h: revision 1.15
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/usr.sbin/rtadvd/config.c
cvs rdiff -u -r1.13 -r1.13.6.1 src/usr.sbin/rtadvd/rtadvd.h

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

Modified files:

Index: src/usr.sbin/rtadvd/config.c
diff -u src/usr.sbin/rtadvd/config.c:1.33 src/usr.sbin/rtadvd/config.c:1.33.8.1
--- src/usr.sbin/rtadvd/config.c:1.33	Thu Jan 24 19:55:28 2013
+++ src/usr.sbin/rtadvd/config.c	Fri May 12 05:05:17 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.c,v 1.33 2013/01/24 19:55:28 christos Exp $	*/
+/*	$NetBSD: config.c,v 1.33.8.1 2017/05/12 05:05:17 snj Exp $	*/
 /*	$KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $	*/
 
 /*
@@ -304,7 +304,7 @@ getconfig(const char *intface, int exith
 		goto errexit;
 	}
 
-	MAYHAVE(val, "rltime", tmp->maxinterval * 3);
+	MAYHAVE(val, "rltime", DEF_ADVROUTERLIFETIME);
 	if (val && (val < tmp->maxinterval || val > MAXROUTERLIFETIME)) {
 		syslog(LOG_ERR,
 		   "<%s> router lifetime (%d) on %s is invalid "

Index: src/usr.sbin/rtadvd/rtadvd.h
diff -u src/usr.sbin/rtadvd/rtadvd.h:1.13 src/usr.sbin/rtadvd/rtadvd.h:1.13.6.1
--- src/usr.sbin/rtadvd/rtadvd.h:1.13	Tue Jul  9 09:34:59 2013
+++ src/usr.sbin/rtadvd/rtadvd.h	Fri May 12 05:05:17 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtadvd.h,v 1.13 2013/07/09 09:34:59 roy Exp $	*/
+/*	$NetBSD: rtadvd.h,v 1.13.6.1 2017/05/12 05:05:17 snj Exp $	*/
 /*	$KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $	*/
 
 /*
@@ -52,6 +52,7 @@ extern struct sockaddr_in6 sin6_siteloca
 #define DEF_ADVCURHOPLIMIT 64
 #define DEF_ADVVALIDLIFETIME 2592000
 #define DEF_ADVPREFERREDLIFETIME 604800
+#define DEF_ADVROUTERLIFETIME 1800
 
 #define MAXROUTERLIFETIME 9000
 #define MIN_MAXINTERVAL 4

CVS commit: [netbsd-7] src/usr.sbin/rtadvd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 05:05:17 UTC 2017

Modified Files:
src/usr.sbin/rtadvd [netbsd-7]: config.c rtadvd.h

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1373):
usr.sbin/rtadvd/config.c: revision 1.36
usr.sbin/rtadvd/rtadvd.h: revision 1.15
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/usr.sbin/rtadvd/config.c
cvs rdiff -u -r1.13 -r1.13.6.1 src/usr.sbin/rtadvd/rtadvd.h

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

CVS commit: [netbsd-7] src/sys/dev/pci/hdaudio

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 04:59:12 UTC 2017

Modified Files:
src/sys/dev/pci/hdaudio [netbsd-7]: hdaudio_pci.c

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1369):
sys/dev/pci/hdaudio/hdaudio_pci.c: patch based on revision 1.6 of 
sys/dev/pci/hdaudio_pci.c
Always allow hdaudio(4) to suspend
Sometimes hdaudio(4) can fail to attach, but the device remains in the
tree. Even though the PMF registration is performed, it is explicitly
de-registered in the code path for errors - therefore preventing suspending
later. This patch makes sure PMF registration is performed accordingly upon
errors as well.
No objection on tech-kern@.
Tested on a Lenovo ThinkPad T440s (amd64).


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 src/sys/dev/pci/hdaudio/hdaudio_pci.c

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

Modified files:

Index: src/sys/dev/pci/hdaudio/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12.4.2 src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12.4.3
--- src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12.4.2	Fri Jul 17 04:44:41 2015
+++ src/sys/dev/pci/hdaudio/hdaudio_pci.c	Fri May 12 04:59:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.12.4.2 2015/07/17 04:44:41 snj Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.12.4.3 2017/05/12 04:59:12 snj Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd 
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.12.4.2 2015/07/17 04:44:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.12.4.3 2017/05/12 04:59:12 snj Exp $");
 
 #include 
 #include 
@@ -156,9 +156,6 @@ hdaudio_pci_attach(device_t parent, devi
 	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 
-	if (!pmf_device_register(self, NULL, hdaudio_pci_resume))
-		aprint_error_dev(self, "couldn't establish power handler\n");
-
 	hdaudio_pci_reinit(sc);
 
 	/* Attach bus-independent HD audio layer */
@@ -172,8 +169,11 @@ hdaudio_pci_attach(device_t parent, devi
 		csr = pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_COMMAND_STATUS_REG);
 		csr &= ~(PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_BACKTOBACK_ENABLE);
 		pci_conf_write(sc->sc_pc, sc->sc_tag, PCI_COMMAND_STATUS_REG, csr);
-		pmf_device_deregister(self);
+		if (!pmf_device_register(self, NULL, NULL))
+			aprint_error_dev(self, "couldn't establish power handler\n");
 	}
+	else if (!pmf_device_register(self, NULL, hdaudio_pci_resume))
+		aprint_error_dev(self, "couldn't establish power handler\n");
 }
 
 static int

CVS commit: [netbsd-7] src/sys/dev/pci/hdaudio

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri May 12 04:59:12 UTC 2017

Modified Files:
src/sys/dev/pci/hdaudio [netbsd-7]: hdaudio_pci.c

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1369):
sys/dev/pci/hdaudio/hdaudio_pci.c: patch based on revision 1.6 of 
sys/dev/pci/hdaudio_pci.c
Always allow hdaudio(4) to suspend
Sometimes hdaudio(4) can fail to attach, but the device remains in the
tree. Even though the PMF registration is performed, it is explicitly
de-registered in the code path for errors - therefore preventing suspending
later. This patch makes sure PMF registration is performed accordingly upon
errors as well.
No objection on tech-kern@.
Tested on a Lenovo ThinkPad T440s (amd64).


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 src/sys/dev/pci/hdaudio/hdaudio_pci.c

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

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Fri May 12 04:15:40 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Blksize is now calculated on sc_pustream/sc_rustream.
Don't allow hw ring buffer to be saturated and data overwritten.

It should help PR kern/52175.


To generate a diff of this commit:
cvs rdiff -u -r1.341 -r1.342 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.341 src/sys/dev/audio.c:1.342
--- src/sys/dev/audio.c:1.341	Thu May 11 23:39:15 2017
+++ src/sys/dev/audio.c	Fri May 12 04:15:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.341 2017/05/11 23:39:15 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.342 2017/05/12 04:15:40 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.341 2017/05/11 23:39:15 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.342 2017/05/12 04:15:40 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -2659,20 +2659,23 @@ audio_calc_blksize(struct audio_softc *s
 		   struct virtual_channel *vc)
 {
 	const audio_params_t *parm;
-	struct audio_ringbuffer *rb;
+	struct audio_stream *rb;
+	int *blksize;
 
 	if (vc->sc_blkset)
 		return;
 
 	if (mode == AUMODE_PLAY) {
-		rb = >sc_mpr;
-		parm = >s.param;
+		rb = vc->sc_pustream;
+		parm = >param;
+		blksize = >sc_mpr.blksize;
 	} else {
-		rb = >sc_mrr;
-		parm = >s.param;
+		rb = vc->sc_rustream;
+		parm = >param;
+		blksize = >sc_mrr.blksize;
 	}
 
-	rb->blksize = parm->sample_rate * audio_blk_ms / 1000 *
+	*blksize = parm->sample_rate * audio_blk_ms / 1000 *
 	 parm->channels * parm->precision / NBBY;
 
 	DPRINTF(("audio_calc_blksize: %s blksize=%d\n",
@@ -5517,6 +5520,9 @@ mix_write(void *arg)
 	cc = blksize;
 	error = 0;
 
+	if (audio_stream_get_used(vc->sc_pustream) > blksize)
+		goto done;
+
 	tocopy = vc->sc_pustream->inp;
 	orig = __UNCONST(sc->sc_pr.s.outp);
 	used = blksize;
@@ -5547,6 +5553,7 @@ mix_write(void *arg)
 	sc->sc_pr.s.outp = audio_stream_add_outp(>sc_pr.s,
 	sc->sc_pr.s.outp, blksize);
 
+done:
 	if (vc->sc_npfilters > 0) {
 		null_fetcher.fetch_to = null_fetcher_fetch_to;
 		filter = vc->sc_pfilters[0];

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Fri May 12 04:15:40 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Blksize is now calculated on sc_pustream/sc_rustream.
Don't allow hw ring buffer to be saturated and data overwritten.

It should help PR kern/52175.


To generate a diff of this commit:
cvs rdiff -u -r1.341 -r1.342 src/sys/dev/audio.c

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

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri May 12 02:34:46 UTC 2017

Modified Files:
src/tests/net/ipsec: algorithms.sh t_ipsec_gif.sh t_ipsec_l2tp.sh
t_ipsec_transport.sh t_ipsec_tunnel.sh t_ipsec_tunnel_odd.sh

Log Message:
Dedup some routines


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/ipsec/algorithms.sh \
src/tests/net/ipsec/t_ipsec_transport.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/ipsec/t_ipsec_tunnel.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/t_ipsec_tunnel_odd.sh

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

Modified files:

Index: src/tests/net/ipsec/algorithms.sh
diff -u src/tests/net/ipsec/algorithms.sh:1.3 src/tests/net/ipsec/algorithms.sh:1.4
--- src/tests/net/ipsec/algorithms.sh:1.3	Thu Apr 27 08:06:59 2017
+++ src/tests/net/ipsec/algorithms.sh	Fri May 12 02:34:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: algorithms.sh,v 1.3 2017/04/27 08:06:59 ozaki-r Exp $
+#	$NetBSD: algorithms.sh,v 1.4 2017/05/12 02:34:45 ozaki-r Exp $
 #
 # Copyright (c) 2017 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -160,3 +160,17 @@ generate_key()
 
 	echo $key
 }
+
+generate_algo_args()
+{
+	local proto=$1
+	local algo=$2
+	local keylen=$(get_one_valid_keylen $algo)
+	local key=$(generate_key $keylen)
+
+	if [ $proto = esp ]; then
+		echo "-E $algo $key"
+	else
+		echo "-A $algo $key"
+	fi
+}
Index: src/tests/net/ipsec/t_ipsec_transport.sh
diff -u src/tests/net/ipsec/t_ipsec_transport.sh:1.3 src/tests/net/ipsec/t_ipsec_transport.sh:1.4
--- src/tests/net/ipsec/t_ipsec_transport.sh:1.3	Wed May 10 04:46:13 2017
+++ src/tests/net/ipsec/t_ipsec_transport.sh	Fri May 12 02:34:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ipsec_transport.sh,v 1.3 2017/05/10 04:46:13 ozaki-r Exp $
+#	$NetBSD: t_ipsec_transport.sh,v 1.4 2017/05/12 02:34:45 ozaki-r Exp $
 #
 # Copyright (c) 2017 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -37,19 +37,10 @@ test_ipsec4_transport()
 	local algo=$2
 	local ip_local=10.0.0.1
 	local ip_peer=10.0.0.2
-	local keylen=$(get_one_valid_keylen $algo)
-	local key=$(generate_key $keylen)
 	local tmpfile=./tmp
 	local outfile=./out
-	local opt= proto_cap=
-
-	if [ $proto = esp ]; then
-		opt=-E
-		proto_cap=ESP
-	else
-		opt=-A
-		proto_cap=AH
-	fi
+	local proto_cap=$(echo $proto | tr 'a-z' 'A-Z')
+	local algo_args="$(generate_algo_args $proto $algo)"
 
 	rump_server_crypto_start $SOCK_LOCAL netipsec
 	rump_server_crypto_start $SOCK_PEER netipsec
@@ -78,8 +69,8 @@ test_ipsec4_transport()
 	export RUMP_SERVER=$SOCK_LOCAL
 	# from https://www.netbsd.org/docs/network/ipsec/
 	cat > $tmpfile <<-EOF
-	add $ip_local $ip_peer $proto 1 $opt $algo $key;
-	add $ip_peer $ip_local $proto 10001 $opt $algo $key;
+	add $ip_local $ip_peer $proto 1 $algo_args;
+	add $ip_peer $ip_local $proto 10001 $algo_args;
 	spdadd $ip_local $ip_peer any -P out ipsec $proto/transport//require;
 	EOF
 	$DEBUG && cat $tmpfile
@@ -88,8 +79,8 @@ test_ipsec4_transport()
 
 	export RUMP_SERVER=$SOCK_PEER
 	cat > $tmpfile <<-EOF
-	add $ip_local $ip_peer $proto 1 $opt $algo $key;
-	add $ip_peer $ip_local $proto 10001 $opt $algo $key;
+	add $ip_local $ip_peer $proto 1 $algo_args;
+	add $ip_peer $ip_local $proto 10001 $algo_args;
 	spdadd $ip_peer $ip_local any -P out ipsec $proto/transport//require;
 	EOF
 	$DEBUG && cat $tmpfile
@@ -115,19 +106,10 @@ test_ipsec6_transport()
 	local algo=$2
 	local ip_local=fd00::1
 	local ip_peer=fd00::2
-	local keylen=$(get_one_valid_keylen $algo)
-	local key=$(generate_key $keylen)
 	local tmpfile=./tmp
 	local outfile=./out
-	local opt= proto_cap=
-
-	if [ $proto = esp ]; then
-		opt=-E
-		proto_cap=ESP
-	else
-		opt=-A
-		proto_cap=AH
-	fi
+	local proto_cap=$(echo $proto | tr 'a-z' 'A-Z')
+	local algo_args="$(generate_algo_args $proto $algo)"
 
 	rump_server_crypto_start $SOCK_LOCAL netinet6 netipsec
 	rump_server_crypto_start $SOCK_PEER netinet6 netipsec
@@ -156,8 +138,8 @@ test_ipsec6_transport()
 	export RUMP_SERVER=$SOCK_LOCAL
 	# from https://www.netbsd.org/docs/network/ipsec/
 	cat > $tmpfile <<-EOF
-	add $ip_local $ip_peer $proto 1 $opt $algo $key;
-	add $ip_peer $ip_local $proto 10001 $opt $algo $key;
+	add $ip_local $ip_peer $proto 1 $algo_args;
+	add $ip_peer $ip_local $proto 10001 $algo_args;
 	spdadd $ip_local $ip_peer any -P out ipsec $proto/transport//require;
 	EOF
 	$DEBUG && cat $tmpfile
@@ -166,8 +148,8 @@ test_ipsec6_transport()
 
 	export RUMP_SERVER=$SOCK_PEER
 	cat > $tmpfile <<-EOF
-	add $ip_local $ip_peer $proto 1 $opt $algo $key;
-	add $ip_peer $ip_local $proto 10001 $opt $algo $key;
+	add $ip_local $ip_peer $proto 1 $algo_args;
+	add $ip_peer $ip_local $proto 10001 $algo_args;
 	spdadd $ip_peer $ip_local any -P out ipsec $proto/transport//require;
 	EOF
 	$DEBUG && cat $tmpfile

Index: 

CVS commit: src/tests/net/ipsec

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Fri May 12 02:34:46 UTC 2017

Modified Files:
src/tests/net/ipsec: algorithms.sh t_ipsec_gif.sh t_ipsec_l2tp.sh
t_ipsec_transport.sh t_ipsec_tunnel.sh t_ipsec_tunnel_odd.sh

Log Message:
Dedup some routines


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/ipsec/algorithms.sh \
src/tests/net/ipsec/t_ipsec_transport.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/ipsec/t_ipsec_tunnel.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/t_ipsec_tunnel_odd.sh

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

CVS commit: src/sys/dev/rasops

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Fri May 12 00:41:25 UTC 2017

Modified Files:
src/sys/dev/rasops: rasops.c

Log Message:
rasops_reconfig(): don't clear flags we won't set here


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/rasops/rasops.c

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

CVS commit: src/sys/dev/rasops

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Fri May 12 00:41:25 UTC 2017

Modified Files:
src/sys/dev/rasops: rasops.c

Log Message:
rasops_reconfig(): don't clear flags we won't set here


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/rasops/rasops.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/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.75 src/sys/dev/rasops/rasops.c:1.76
--- src/sys/dev/rasops/rasops.c:1.75	Sat Apr 22 15:05:02 2017
+++ src/sys/dev/rasops/rasops.c	Fri May 12 00:41:25 2017
@@ -1,4 +1,4 @@
-/*	 $NetBSD: rasops.c,v 1.75 2017/04/22 15:05:02 macallan Exp $	*/
+/*	 $NetBSD: rasops.c,v 1.76 2017/05/12 00:41:25 macallan Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.75 2017/04/22 15:05:02 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.76 2017/05/12 00:41:25 macallan Exp $");
 
 #include "opt_rasops.h"
 #include "rasops_glue.h"
@@ -415,12 +415,14 @@ rasops_reconfig(struct rasops_info *ri, 
 	ri->ri_ops.cursor = rasops_cursor;
 	ri->ri_do_cursor = rasops_do_cursor;
 
+	ri->ri_caps &= ~(WSSCREEN_UNDERLINE | WSSCREEN_HILIT |
+		WSSCREEN_WSCOLORS | WSSCREEN_REVERSE);
 	if (ri->ri_depth < 8 || (ri->ri_flg & RI_FORCEMONO) != 0) {
 		ri->ri_ops.allocattr = rasops_allocattr_mono;
-		ri->ri_caps = WSSCREEN_UNDERLINE | WSSCREEN_REVERSE;
+		ri->ri_caps |= WSSCREEN_UNDERLINE | WSSCREEN_REVERSE;
 	} else {
 		ri->ri_ops.allocattr = rasops_allocattr_color;
-		ri->ri_caps = WSSCREEN_UNDERLINE | WSSCREEN_HILIT |
+		ri->ri_caps |= WSSCREEN_UNDERLINE | WSSCREEN_HILIT |
 		WSSCREEN_WSCOLORS | WSSCREEN_REVERSE;
 	}
 

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 23:50:17 UTC 2017

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

Log Message:
protect against NULL, from PaulG


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

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

Modified files:

Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.90 src/sys/kern/kern_event.c:1.91
--- src/sys/kern/kern_event.c:1.90	Tue May  9 17:18:51 2017
+++ src/sys/kern/kern_event.c	Thu May 11 19:50:17 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_event.c,v 1.90 2017/05/09 21:18:51 christos Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.91 2017/05/11 23:50:17 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.90 2017/05/09 21:18:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.91 2017/05/11 23:50:17 christos Exp $");
 
 #include 
 #include 
@@ -1020,9 +1020,10 @@ kqueue_register(struct kqueue *kq, struc
 			KERNEL_UNLOCK_ONE(NULL);	/* XXXSMP */
 			if (error != 0) {
 #ifdef DIAGNOSTIC
+
 printf("%s: event not supported for file type"
-" %d (error %d)\n", __func__,
-((file_t *)kn->kn_obj)->f_type, error);
+" %d (error %d)\n", __func__, kn->kn_obj ?
+((file_t *)kn->kn_obj)->f_type : -1, error);
 #endif
 /* knote_detach() drops fdp->fd_lock */
 knote_detach(kn, fdp, false);

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 23:50:17 UTC 2017

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

Log Message:
protect against NULL, from PaulG


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

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

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:39:15 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
UVM_ADV_NORMAL-> UVM_ADV_RANDOM as this reflects the usage more acurately.

Ok riastradh@.


To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.340 src/sys/dev/audio.c:1.341
--- src/sys/dev/audio.c:1.340	Thu May 11 23:32:27 2017
+++ src/sys/dev/audio.c	Thu May 11 23:39:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.340 2017/05/11 23:32:27 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.341 2017/05/11 23:39:15 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.340 2017/05/11 23:32:27 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.341 2017/05/11 23:39:15 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1212,7 +1212,7 @@ audio_alloc_ring(struct audio_softc *sc,
 		/* Map it into the kernel virtual address space.  */
 		error = uvm_map(kernel_map, , vsize, r->uobj, 0, 0,
 		UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW, UVM_INH_NONE,
-			UVM_ADV_NORMAL, 0));
+			UVM_ADV_RANDOM, 0));
 		if (error) {
 			uao_detach(r->uobj);	/* release reference */
 			r->uobj = NULL;		/* paranoia */
@@ -3456,7 +3456,7 @@ audio_mmap(struct audio_softc *sc, off_t
 	/* Acquire a reference for the mmap.  munmap will release.*/
 	uao_reference(*uobjp);
 	*maxprotp = prot;
-	*advicep = UVM_ADV_NORMAL;
+	*advicep = UVM_ADV_RANDOM;
 	*flagsp = MAP_SHARED;
 	return 0;
 }

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:39:15 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
UVM_ADV_NORMAL-> UVM_ADV_RANDOM as this reflects the usage more acurately.

Ok riastradh@.


To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/sys/dev/audio.c

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

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:32:27 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
If silence is inserted into hw ring directly the free space in the hw ring
not mix ring is needed.


To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/dev/audio.c

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

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:32:27 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
If silence is inserted into hw ring directly the free space in the hw ring
not mix ring is needed.


To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.339 src/sys/dev/audio.c:1.340
--- src/sys/dev/audio.c:1.339	Thu May 11 23:26:48 2017
+++ src/sys/dev/audio.c	Thu May 11 23:32:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.339 2017/05/11 23:26:48 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.340 2017/05/11 23:32:27 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.339 2017/05/11 23:26:48 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.340 2017/05/11 23:32:27 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -3657,7 +3657,7 @@ audio_pint(void *v)
 		DPRINTFN(3, ("HW RING - INSERT SILENCE\n"));
 		used = blksize;
 		while (used > 0) {
-			cc = sc->sc_pr.s.end - sc->sc_pr.s.inp;
+			cc = vc->sc_mpr.s.end - vc->sc_mpr.s.inp;
 			if (cc > used)
 cc = used;
 			audio_fill_silence(>sc_pparams, vc->sc_mpr.s.inp, cc);

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:26:48 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Improved overflow test for audio_mmap.

Ok riastradh@.


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.338 src/sys/dev/audio.c:1.339
--- src/sys/dev/audio.c:1.338	Thu May 11 23:20:38 2017
+++ src/sys/dev/audio.c	Thu May 11 23:26:48 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.338 2017/05/11 23:20:38 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.339 2017/05/11 23:26:48 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.338 2017/05/11 23:20:38 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.339 2017/05/11 23:26:48 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -3407,10 +3407,7 @@ audio_mmap(struct audio_softc *sc, off_t
 
 	if (*offp < 0)
 		return EINVAL;
-	if ((off_t)(*offp + len) < *offp) {
-		/* no offset wrapping */
-		return EOVERFLOW;
-	}
+
 #if 0
 /* XXX
  * The idea here was to use the protection to determine if
@@ -3435,7 +3432,7 @@ audio_mmap(struct audio_softc *sc, off_t
 	cb = >sc_mpr;
 #endif
 
-	if ((u_int)*offp >= cb->s.bufsize)
+	if (len > cb->s.bufsize || *offp > cb->s.bufsize - len)
 		return EOVERFLOW;
 
 	if (!cb->mmapped) {

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:26:48 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Improved overflow test for audio_mmap.

Ok riastradh@.


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/sys/dev/audio.c

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

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:20:38 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Revert FNONBLOCK logic to that from rev 1.335.

Ok riastradh@.


To generate a diff of this commit:
cvs rdiff -u -r1.337 -r1.338 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.337 src/sys/dev/audio.c:1.338
--- src/sys/dev/audio.c:1.337	Mon May  8 07:31:34 2017
+++ src/sys/dev/audio.c	Thu May 11 23:20:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.337 2017/05/08 07:31:34 martin Exp $	*/
+/*	$NetBSD: audio.c,v 1.338 2017/05/11 23:20:38 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.337 2017/05/08 07:31:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.338 2017/05/11 23:20:38 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1690,18 +1690,17 @@ audioclose(struct file *fp)
 
 static int
 audioread(struct file *fp, off_t *offp, struct uio *uio, kauth_cred_t cred,
-	  int flags)
+	  int ioflag)
 {
 	struct audio_softc *sc;
 	struct virtual_channel *vc;
-	int error, ioflag;
+	int error;
 	dev_t dev;
 
 	if (fp->f_audioctx == NULL)
 		return EIO;
 
 	dev = fp->f_audioctx->dev;
-	ioflag = 0;
 
 	if ((error = audio_enter(dev, RW_READER, )) != 0)
 		return error;
@@ -1730,18 +1729,17 @@ audioread(struct file *fp, off_t *offp, 
 
 static int
 audiowrite(struct file *fp, off_t *offp, struct uio *uio, kauth_cred_t cred,
-	   int flags)
+	   int ioflag)
 {
 	struct audio_softc *sc;
 	struct virtual_channel *vc;
-	int error, ioflag;
+	int error;
 	dev_t dev;
 
 	if (fp->f_audioctx == NULL)
 		return EIO;
 
 	dev = fp->f_audioctx->dev;
-	ioflag = 0;
 
 	if ((error = audio_enter(dev, RW_READER, )) != 0)
 		return error;

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 23:20:38 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Revert FNONBLOCK logic to that from rev 1.335.

Ok riastradh@.


To generate a diff of this commit:
cvs rdiff -u -r1.337 -r1.338 src/sys/dev/audio.c

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

CVS commit: src/sys/kern

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 22:38:56 UTC 2017

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

Log Message:
Explicitly set the flags instead of masking set values in.

This fixes FNONBLOCK weirdness seen in audio.c

OK christos@ and martin@.


To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/kern/kern_descrip.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_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.229 src/sys/kern/kern_descrip.c:1.230
--- src/sys/kern/kern_descrip.c:1.229	Mon Aug  3 04:55:15 2015
+++ src/sys/kern/kern_descrip.c	Thu May 11 22:38:56 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_descrip.c,v 1.229 2015/08/03 04:55:15 christos Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.230 2017/05/11 22:38:56 nat Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.229 2015/08/03 04:55:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.230 2017/05/11 22:38:56 nat Exp $");
 
 #include 
 #include 
@@ -1864,7 +1864,7 @@ fd_clone(file_t *fp, unsigned fd, int fl
 	fdfile_t *ff;
 	filedesc_t *fdp;
 
-	fp->f_flag |= flag & FMASK;
+	fp->f_flag = flag & FMASK;
 	fdp = curproc->p_fd;
 	ff = fdp->fd_dt->dt_ff[fd];
 	KASSERT(ff != NULL);

CVS commit: src/sys/kern

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Thu May 11 22:38:56 UTC 2017

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

Log Message:
Explicitly set the flags instead of masking set values in.

This fixes FNONBLOCK weirdness seen in audio.c

OK christos@ and martin@.


To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/kern/kern_descrip.c

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

CVS commit: src/share/misc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu May 11 22:19:29 UTC 2017

Modified Files:
src/share/misc: acronyms.comp

Log Message:
Document SPL in wtf(6)

SPLsystem interrupt priority level
SPLspinlock

The former is documented in spl(9) in the NetBSD context.
The latter is used in some spinlock implementations.


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/share/misc/acronyms.comp

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

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.181 src/share/misc/acronyms.comp:1.182
--- src/share/misc/acronyms.comp:1.181	Thu May 11 21:59:28 2017
+++ src/share/misc/acronyms.comp	Thu May 11 22:19:29 2017
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.181 2017/05/11 21:59:28 kamil Exp $
+$NetBSD: acronyms.comp,v 1.182 2017/05/11 22:19:29 kamil Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -1219,6 +1219,8 @@ SPD	serial presence detect
 SPDIF	Sony/Philips digital interface format
 SPI	serial peripheral interface
 SPI	stateful packet inspection
+SPL	system interrupt priority level
+SPL	spinlock
 SPMD	single process, multiple data
 SPR	special purpose register
 SPT	sectors per track

CVS commit: src/share/misc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu May 11 22:19:29 UTC 2017

Modified Files:
src/share/misc: acronyms.comp

Log Message:
Document SPL in wtf(6)

SPLsystem interrupt priority level
SPLspinlock

The former is documented in spl(9) in the NetBSD context.
The latter is used in some spinlock implementations.


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/share/misc/acronyms.comp

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

CVS commit: src/share/misc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu May 11 21:59:28 UTC 2017

Modified Files:
src/share/misc: acronyms.comp

Log Message:
Add new entries for wtf(6)

CCNUMA cache-coherent non-uniform memory access
PILPriority Interrut Level
RMORelaxed Memory Ordering
TSOTotal Store Ordering


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/share/misc/acronyms.comp

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

CVS commit: src/share/misc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Thu May 11 21:59:28 UTC 2017

Modified Files:
src/share/misc: acronyms.comp

Log Message:
Add new entries for wtf(6)

CCNUMA cache-coherent non-uniform memory access
PILPriority Interrut Level
RMORelaxed Memory Ordering
TSOTotal Store Ordering


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/share/misc/acronyms.comp

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

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.180 src/share/misc/acronyms.comp:1.181
--- src/share/misc/acronyms.comp:1.180	Fri May  5 14:23:47 2017
+++ src/share/misc/acronyms.comp	Thu May 11 21:59:28 2017
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.180 2017/05/05 14:23:47 ginsbach Exp $
+$NetBSD: acronyms.comp,v 1.181 2017/05/11 21:59:28 kamil Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -178,6 +178,7 @@ CBR	constant bit rate
 CC	carbon coby
 CCD	charge coupled device
 CCI	co-channel interferer
+CCNUMA	cache-coherent non-uniform memory access
 CD	cache disable
 CD	compact disc
 CDDA	compact disc digital audio
@@ -961,6 +962,7 @@ PIC	programmable interrupt controller
 PICNIC	problem in chair, not in computer
 PID	process id
 PIE	position independent executable
+PIL	Priority Interrut Level
 PIM	personal information manager
 PIM	platform-independent model
 PIO	programmed input/output
@@ -1081,6 +1083,7 @@ RLL	run length limited
 RLO	right-to-left override
 RM	read miss
 RMI	remote method invocation
+RMO	Relaxed Memory Ordering
 RMPM	rapid memory power management
 RMS	root mean square
 RMW	read, modify, write
@@ -1311,6 +1314,7 @@ TSC	time stamp counter
 TSD	time stamp disable
 TSL	test, set, lock
 TSO	time sharing option
+TSO	Total Store Ordering
 TSP	Time-Stamp Protocol
 TSP	Tunnel Setup Protocol
 TSP	time synchronization protocol

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

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu May 11 21:31:12 UTC 2017

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

Log Message:
Use kpreempt_{dis,en}able() rather than splsoftserial() for blocking
the local execution of the low-priority xcall.

Thanks to Kengo NAKAHARA for pointing this out.


To generate a diff of this commit:
cvs rdiff -u -r1.1.6.3 -r1.1.6.4 src/sys/kern/subr_localcount.c

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

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

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu May 11 21:31:12 UTC 2017

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

Log Message:
Use kpreempt_{dis,en}able() rather than splsoftserial() for blocking
the local execution of the low-priority xcall.

Thanks to Kengo NAKAHARA for pointing this out.


To generate a diff of this commit:
cvs rdiff -u -r1.1.6.3 -r1.1.6.4 src/sys/kern/subr_localcount.c

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

Modified files:

Index: src/sys/kern/subr_localcount.c
diff -u src/sys/kern/subr_localcount.c:1.1.6.3 src/sys/kern/subr_localcount.c:1.1.6.4
--- src/sys/kern/subr_localcount.c:1.1.6.3	Tue May  2 03:19:22 2017
+++ src/sys/kern/subr_localcount.c	Thu May 11 21:31:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_localcount.c,v 1.1.6.3 2017/05/02 03:19:22 pgoyette Exp $	*/
+/*	$NetBSD: subr_localcount.c,v 1.1.6.4 2017/05/11 21:31:12 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_localcount.c,v 1.1.6.3 2017/05/02 03:19:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_localcount.c,v 1.1.6.4 2017/05/11 21:31:12 pgoyette Exp $");
 
 #include 
 #include 
@@ -215,7 +215,6 @@ localcount_acquire(struct localcount *lc
 void
 localcount_release(struct localcount *lc, kcondvar_t *cv, kmutex_t *interlock)
 {
-	int s;
 
 	/*
 	 * Block xcall so that if someone begins draining after we see
@@ -227,7 +226,7 @@ localcount_release(struct localcount *lc
 	 * lc->lc_totalp as null, this CPU will not wake
 	 * localcount_drain.
 	 */
-	s = splsoftserial();
+	kpreempt_disable();
 
 	KDASSERT(mutex_ownable(interlock));
 	if (__predict_false(lc->lc_totalp != NULL)) {
@@ -245,5 +244,5 @@ localcount_release(struct localcount *lc
 	}
 
 	localcount_adjust(lc, -1);
-out:	splx(s);
+ out:	kpreempt_enable();
 }

CVS commit: src/lib/librumpclient

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 18:44:50 UTC 2017

Modified Files:
src/lib/librumpclient: rumpclient.h

Log Message:
make it the same as rump.h


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/librumpclient/rumpclient.h

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

Modified files:

Index: src/lib/librumpclient/rumpclient.h
diff -u src/lib/librumpclient/rumpclient.h:1.16 src/lib/librumpclient/rumpclient.h:1.17
--- src/lib/librumpclient/rumpclient.h:1.16	Thu May 11 13:47:22 2017
+++ src/lib/librumpclient/rumpclient.h	Thu May 11 14:44:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpclient.h,v 1.16 2017/05/11 17:47:22 christos Exp $	*/
+/*	$NetBSD: rumpclient.h,v 1.17 2017/05/11 18:44:50 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -39,8 +39,11 @@
 #endif /* !__returns_twice */
 
 #if !defined(RUMP_REGISTER_T)
-#define RUMP_REGISTER_T long
+# define RUMP_REGISTER_T long
+# if !defined(_KERNEL) && !defined(_KMEMUSER) &&  \
+!defined(_KERNTYPES) && !defined(_STANDALONE)
 typedef RUMP_REGISTER_T register_t;
+# endif
 #endif
 
 struct rumpclient_fork;

CVS commit: src/lib/librumpclient

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 18:44:50 UTC 2017

Modified Files:
src/lib/librumpclient: rumpclient.h

Log Message:
make it the same as rump.h


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/librumpclient/rumpclient.h

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

CVS commit: src/sys/rump/include/rump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 18:16:00 UTC 2017

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
... but define RUMP_REGISTER_T if not defined.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/rump/include/rump/rump.h

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

CVS commit: src/sys/rump/include/rump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 18:16:00 UTC 2017

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
... but define RUMP_REGISTER_T if not defined.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/rump/include/rump/rump.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/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.69 src/sys/rump/include/rump/rump.h:1.70
--- src/sys/rump/include/rump/rump.h:1.69	Thu May 11 14:08:10 2017
+++ src/sys/rump/include/rump/rump.h	Thu May 11 14:16:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.69 2017/05/11 18:08:10 christos Exp $	*/
+/*	$NetBSD: rump.h,v 1.70 2017/05/11 18:16:00 christos Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -46,10 +46,12 @@ struct lwp;
 struct modinfo;
 struct uio;
 
-#if !defined(RUMP_REGISTER_T) && !defined(_KERNEL) && \
-!defined(_KMEMUSER) && !defined(_KERNTYPES) && !defined(_STANDALONE)
-#define RUMP_REGISTER_T long
+#if !defined(RUMP_REGISTER_T)
+# define RUMP_REGISTER_T long
+# if !defined(_KERNEL) && !defined(_KMEMUSER) &&  \
+!defined(_KERNTYPES) && !defined(_STANDALONE)
 typedef RUMP_REGISTER_T register_t;
+# endif
 #endif
 
 #include 

CVS commit: src/sys/rump/include/rump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 18:08:10 UTC 2017

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
Use the same exposure rules for register_t as  does.
Eventually we could remove -D_KERNTYPES from all the rump libraries...


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/rump/include/rump/rump.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/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.68 src/sys/rump/include/rump/rump.h:1.69
--- src/sys/rump/include/rump/rump.h:1.68	Sun Jan 31 18:14:34 2016
+++ src/sys/rump/include/rump/rump.h	Thu May 11 14:08:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.h,v 1.68 2016/01/31 23:14:34 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.69 2017/05/11 18:08:10 christos Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -46,7 +46,8 @@ struct lwp;
 struct modinfo;
 struct uio;
 
-#if (!defined(_KERNEL)) && (defined(__sun__) || defined(__ANDROID__)) && !defined(RUMP_REGISTER_T)
+#if !defined(RUMP_REGISTER_T) && !defined(_KERNEL) && \
+!defined(_KMEMUSER) && !defined(_KERNTYPES) && !defined(_STANDALONE)
 #define RUMP_REGISTER_T long
 typedef RUMP_REGISTER_T register_t;
 #endif

CVS commit: src/sys/rump/include/rump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 18:08:10 UTC 2017

Modified Files:
src/sys/rump/include/rump: rump.h

Log Message:
Use the same exposure rules for register_t as  does.
Eventually we could remove -D_KERNTYPES from all the rump libraries...


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/rump/include/rump/rump.h

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

CVS commit: src/lib/librumpclient

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 17:47:22 UTC 2017

Modified Files:
src/lib/librumpclient: rumpclient.h

Log Message:
Don't depend on stars in order to define things.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/librumpclient/rumpclient.h

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

Modified files:

Index: src/lib/librumpclient/rumpclient.h
diff -u src/lib/librumpclient/rumpclient.h:1.15 src/lib/librumpclient/rumpclient.h:1.16
--- src/lib/librumpclient/rumpclient.h:1.15	Sun Jan 20 10:23:21 2013
+++ src/lib/librumpclient/rumpclient.h	Thu May 11 13:47:22 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpclient.h,v 1.15 2013/01/20 15:23:21 pooka Exp $	*/
+/*	$NetBSD: rumpclient.h,v 1.16 2017/05/11 17:47:22 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -38,7 +38,7 @@
 #endif /* !__GNUC__ */
 #endif /* !__returns_twice */
 
-#if defined(__sun__) && !defined(RUMP_REGISTER_T)
+#if !defined(RUMP_REGISTER_T)
 #define RUMP_REGISTER_T long
 typedef RUMP_REGISTER_T register_t;
 #endif

CVS commit: src/lib/librumpclient

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May 11 17:47:22 UTC 2017

Modified Files:
src/lib/librumpclient: rumpclient.h

Log Message:
Don't depend on stars in order to define things.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/librumpclient/rumpclient.h

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

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

[Stephen Borrill]

Module Name:src
Committed By:   sborrill
Date:   Thu May 11 15:42:15 UTC 2017

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOMU

Log Message:
Add commented out carp and mpls pseudo-devices to be consistent with
GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/amd64/conf/XEN3_DOMU

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

Modified files:

Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.73 src/sys/arch/amd64/conf/XEN3_DOMU:1.74
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.73	Sun Feb 26 12:41:50 2017
+++ src/sys/arch/amd64/conf/XEN3_DOMU	Thu May 11 15:42:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.73 2017/02/26 12:41:50 rin Exp $
+# $NetBSD: XEN3_DOMU,v 1.74 2017/05/11 15:42:15 sborrill Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -215,8 +215,10 @@ pseudo-device	dm			# device-mapper drive
 
 # network pseudo-devices
 pseudo-device	bpfilter		# Berkeley packet filter
+#pseudo-device	carp			# Common Address Redundancy Protocol
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
+#pseudo-device	mpls			# MPLS pseudo-interface
 pseudo-device	ppp			# Point-to-Point Protocol
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	sl			# Serial Line IP

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

[Stephen Borrill]

Module Name:src
Committed By:   sborrill
Date:   Thu May 11 15:42:15 UTC 2017

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOMU

Log Message:
Add commented out carp and mpls pseudo-devices to be consistent with
GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/amd64/conf/XEN3_DOMU

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

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu May 11 15:07:37 UTC 2017

Modified Files:
src/bin/sh: parser.c

Log Message:
Fix some parser weirdness...
${#VAR:-foo} (or any other modifier on ${#VAR} is a syntax error.
On the other hand ${##} is not, nor is ${##13} though they mean
quite different things (the latter is an idiom everyone should learn,
... $# except we refuse to admit the possibility that it is 13...
Even I cannot explain what ${#-foo} used to do, but it wasn't sane!
(It should be just $# as $# is never unset, but ...)
Shell syntax is truly a wondrous thing!


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/bin/sh/parser.c

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

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.126 src/bin/sh/parser.c:1.127
--- src/bin/sh/parser.c:1.126	Wed May 10 11:06:47 2017
+++ src/bin/sh/parser.c	Thu May 11 15:07:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.126 2017/05/10 11:06:47 kre Exp $	*/
+/*	$NetBSD: parser.c,v 1.127 2017/05/11 15:07:37 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.126 2017/05/10 11:06:47 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.127 2017/05/11 15:07:37 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1748,10 +1748,34 @@ parsesub: {
 		if (c == OPENBRACE) {
 			c = pgetc_linecont();
 			if (c == '#') {
-if ((c = pgetc()) == CLOSEBRACE)
+if ((c = pgetc_linecont()) == CLOSEBRACE)
 	c = '#';
-else
+else if (is_name(c) || isdigit(c))
 	subtype = VSLENGTH;
+else if (is_special(c)) {
+	/*
+	 * ${##} is the length of ${#}
+	 * ${##1} is ${#} with leading 1 gone
+	 *
+	 * this stuff is UGLY!
+	 */
+	if (pgetc_linecont() == CLOSEBRACE) {
+		pungetc();
+		subtype = VSLENGTH;
+	} else {
+		static char cbuf[2];
+		pungetc();
+		cbuf[0] = c;
+		cbuf[1] = '\0';
+		pushstring(cbuf, 1, NULL);
+		c = '#';
+		subtype = 0;
+	}
+} else {
+	pungetc();
+	c = '#';
+	subtype = 0;
+}
 			}
 			else
 subtype = 0;
@@ -1818,6 +1842,8 @@ parsesub: {
 }
 			}
 		} else {
+			if (subtype == VSLENGTH && c != /*{*/ '}')
+synerror("no modifiers allowed with ${#var}");
 			pungetc();
 		}
 		if (ISDBLQUOTE() || arinest)

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu May 11 15:07:37 UTC 2017

Modified Files:
src/bin/sh: parser.c

Log Message:
Fix some parser weirdness...
${#VAR:-foo} (or any other modifier on ${#VAR} is a syntax error.
On the other hand ${##} is not, nor is ${##13} though they mean
quite different things (the latter is an idiom everyone should learn,
... $# except we refuse to admit the possibility that it is 13...
Even I cannot explain what ${#-foo} used to do, but it wasn't sane!
(It should be just $# as $# is never unset, but ...)
Shell syntax is truly a wondrous thing!


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/bin/sh/parser.c

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

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu May 11 14:57:14 UTC 2017

Modified Files:
src/bin/sh: jobs.c

Log Message:
Avoid truncating the command string saved with background jobs if
one of the words happens to contain ${#var}.  (This is the command
string shown by the "jobs" command, and when a background job completes)

While here, undo the LINENO hack when building that string.
And one ot two other foibles...


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/bin/sh/jobs.c

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

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu May 11 14:57:14 UTC 2017

Modified Files:
src/bin/sh: jobs.c

Log Message:
Avoid truncating the command string saved with background jobs if
one of the words happens to contain ${#var}.  (This is the command
string shown by the "jobs" command, and when a background job completes)

While here, undo the LINENO hack when building that string.
And one ot two other foibles...


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/bin/sh/jobs.c

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

Modified files:

Index: src/bin/sh/jobs.c
diff -u src/bin/sh/jobs.c:1.83 src/bin/sh/jobs.c:1.84
--- src/bin/sh/jobs.c:1.83	Tue May  9 05:14:03 2017
+++ src/bin/sh/jobs.c	Thu May 11 14:57:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: jobs.c,v 1.83 2017/05/09 05:14:03 kre Exp $	*/
+/*	$NetBSD: jobs.c,v 1.84 2017/05/11 14:57:14 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: jobs.c,v 1.83 2017/05/09 05:14:03 kre Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.84 2017/05/11 14:57:14 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1423,7 +1423,7 @@ cmdputs(const char *s)
 	int subtype = 0;
 	int quoted = 0;
 	static char vstype[16][4] = { "", "}", "-", "+", "?", "=",
-	"#", "##", "%", "%%" };
+	"#", "##", "%", "%%", "}" };
 
 	p = s;
 	nextc = cmdnextc;
@@ -1435,22 +1435,28 @@ cmdputs(const char *s)
 			break;
 		case CTLVAR:
 			subtype = *p++;
-			if ((subtype & VSTYPE) == VSLENGTH)
+			if (subtype & VSLINENO) {
+if ((subtype & VSTYPE) == VSLENGTH)
+	str = "${#LINENO";
+else
+	str = "${LINENO";
+while (is_digit(*p))
+	p++;
+			} else if ((subtype & VSTYPE) == VSLENGTH)
 str = "${#";
 			else
 str = "${";
 			if (!(subtype & VSQUOTE) != !(quoted & 1)) {
 quoted ^= 1;
 c = '"';
-			} else
+			} else {
 c = *str++;
+			}
 			break;
 		case CTLENDVAR:
-			if (quoted & 1) {
-c = '"';
-str = "}";
-			} else
-c = '}';
+			c = '}';
+			if (quoted & 1)
+str = "\"";
 			quoted >>= 1;
 			subtype = 0;
 			break;
@@ -1474,6 +1480,10 @@ cmdputs(const char *s)
 			quoted ^= 1;
 			c = '"';
 			break;
+		case CTLQUOTEEND:
+			quoted >>= 1;
+			c = '"';
+			break;
 		case '=':
 			if (subtype == 0)
 break;
@@ -1484,6 +1494,9 @@ cmdputs(const char *s)
 c = *str++;
 			if (c != '}')
 quoted <<= 1;
+			else if (*p == CTLENDVAR)
+c = *str++;
+			subtype = 0;
 			break;
 		case '\'':
 		case '\\':
@@ -1497,7 +1510,7 @@ cmdputs(const char *s)
 		default:
 			break;
 		}
-		do {
+		if (c != '\0') do {	/* c == 0 implies nothing in str */
 			*nextc++ = c;
 		} while (--nleft > 0 && str && (c = *str++));
 		str = 0;

CVS commit: src/usr.bin

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu May 11 13:20:02 UTC 2017

Modified Files:
src/usr.bin/rump_dhcpclient: Makefile
src/usr.bin/rump_halt: Makefile

Log Message:
Remove more _KERNTYPES definitions in rump components.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_dhcpclient/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_halt/Makefile

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

Modified files:

Index: src/usr.bin/rump_dhcpclient/Makefile
diff -u src/usr.bin/rump_dhcpclient/Makefile:1.2 src/usr.bin/rump_dhcpclient/Makefile:1.3
--- src/usr.bin/rump_dhcpclient/Makefile:1.2	Sat Jan 23 21:22:50 2016
+++ src/usr.bin/rump_dhcpclient/Makefile	Thu May 11 13:20:02 2017
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2017/05/11 13:20:02 sevan Exp $
 #
 
 PROG=	rump.dhcpclient
 SRCS=	main.c bpf.c common.c configure.c dhcp.c if-bsd.c net.c
-CPPFLAGS+=	-D_KERNTYPES
 
 LDADD+=	-lrumpclient
 

Index: src/usr.bin/rump_halt/Makefile
diff -u src/usr.bin/rump_halt/Makefile:1.2 src/usr.bin/rump_halt/Makefile:1.3
--- src/usr.bin/rump_halt/Makefile:1.2	Sat Jan 23 21:22:50 2016
+++ src/usr.bin/rump_halt/Makefile	Thu May 11 13:20:02 2017
@@ -1,10 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2016/01/23 21:22:50 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2017/05/11 13:20:02 sevan Exp $
 #
 
 PROG=	rump.halt
 
 LDADD+= -lrumpclient
 DPADD+=	${RUMPCLIENT}
-CPPFLAGS+=	-D_KERNTYPES
 
 .include 

CVS commit: src/usr.bin

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu May 11 13:20:02 UTC 2017

Modified Files:
src/usr.bin/rump_dhcpclient: Makefile
src/usr.bin/rump_halt: Makefile

Log Message:
Remove more _KERNTYPES definitions in rump components.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_dhcpclient/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_halt/Makefile

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

CVS commit: src/distrib/amd64

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May 11 10:49:19 UTC 2017

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/uefi-installimage: Makefile

Log Message:
Try to make images big enough for debug sets


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/uefi-installimage/Makefile

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

Modified files:

Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.6 src/distrib/amd64/installimage/Makefile:1.7
--- src/distrib/amd64/installimage/Makefile:1.6	Sun Jan 24 15:30:05 2016
+++ src/distrib/amd64/installimage/Makefile	Thu May 11 10:49:18 2017
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.6 2016/01/24 15:30:05 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2017/05/11 10:49:18 martin Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-install	# gives ${IMGBASE}.img
 
 BOOTDISK=	sd0			# for USB flash etc.
-INSTIMAGEMB?=	1200			# for all installation binaries
+INSTIMAGEMB?=	1300			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot

Index: src/distrib/amd64/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.1 src/distrib/amd64/uefi-installimage/Makefile:1.2
--- src/distrib/amd64/uefi-installimage/Makefile:1.1	Tue Jan 24 11:16:50 2017
+++ src/distrib/amd64/uefi-installimage/Makefile	Thu May 11 10:49:18 2017
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2017/01/24 11:16:50 nonaka Exp $
+#	$NetBSD: Makefile,v 1.2 2017/05/11 10:49:18 martin Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-uefi-install	# gives ${IMGBASE}.img
 
 BOOTDISK=	dk1			# unused (use GUID)
-INSTIMAGEMB?=	1280			# for all installation binaries
+INSTIMAGEMB?=	1380			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot

CVS commit: src/distrib/amd64

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May 11 10:49:19 UTC 2017

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/uefi-installimage: Makefile

Log Message:
Try to make images big enough for debug sets


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/uefi-installimage/Makefile

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

CVS commit: src/lib/librumpuser

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May 11 10:21:56 UTC 2017

Modified Files:
src/lib/librumpuser: rumpuser_port.h

Log Message:
Evil hack to fix the build: provide PRIxREGISTER here.
Sevan, please check and fix correctly ;-)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/lib/librumpuser/rumpuser_port.h

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

Modified files:

Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.49 src/lib/librumpuser/rumpuser_port.h:1.50
--- src/lib/librumpuser/rumpuser_port.h:1.49	Thu May 11 04:27:27 2017
+++ src/lib/librumpuser/rumpuser_port.h	Thu May 11 10:21:55 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.49 2017/05/11 04:27:27 sevan Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.50 2017/05/11 10:21:55 martin Exp $	*/
 
 #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
 #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
@@ -300,6 +300,7 @@ aligned_alloc(size_t alignment, size_t s
 #if !defined(HAVE_REGISTER_T) && !defined(RUMP_REGISTER_T)
 #define RUMP_REGISTER_T long
 typedef RUMP_REGISTER_T register_t;
+#define	PRIxREGISTER	"lx"
 #endif
 
 #include 

CVS commit: src/lib/librumpuser

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May 11 10:21:56 UTC 2017

Modified Files:
src/lib/librumpuser: rumpuser_port.h

Log Message:
Evil hack to fix the build: provide PRIxREGISTER here.
Sevan, please check and fix correctly ;-)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/lib/librumpuser/rumpuser_port.h

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

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu May 11 09:09:54 UTC 2017

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

Log Message:
Fix non-DIAGNOSTIC build


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/mips/mips/vm_machdep.c

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

Modified files:

Index: src/sys/arch/mips/mips/vm_machdep.c
diff -u src/sys/arch/mips/mips/vm_machdep.c:1.157 src/sys/arch/mips/mips/vm_machdep.c:1.158
--- src/sys/arch/mips/mips/vm_machdep.c:1.157	Wed May 10 22:23:13 2017
+++ src/sys/arch/mips/mips/vm_machdep.c	Thu May 11 09:09:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.157 2017/05/10 22:23:13 skrll Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.158 2017/05/11 09:09:54 skrll Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.157 2017/05/10 22:23:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.158 2017/05/11 09:09:54 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_coredump.h"
@@ -206,7 +206,7 @@ cpu_uarea_alloc(bool system)
 	 */
 	const struct vm_page * const pg = TAILQ_FIRST();
 	KASSERT(pg != NULL);
-	const paddr_t pa = VM_PAGE_TO_PHYS(pg);
+	const paddr_t __diagused pa = VM_PAGE_TO_PHYS(pg);
 	KASSERTMSG(pa >= pmap_limits.avail_start,
 	"pa (%#"PRIxPADDR") < pmap_limits.avail_start (%#"PRIxPADDR")",
 	 pa, pmap_limits.avail_start);

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu May 11 09:09:54 UTC 2017

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

Log Message:
Fix non-DIAGNOSTIC build


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/mips/mips/vm_machdep.c

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

CVS commit: src/sys/arch/evbmips/conf

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Thu May 11 07:56:43 UTC 2017

Modified Files:
src/sys/arch/evbmips/conf: LOONGSON

Log Message:
COPY_SYMTAB=1 so ddb commands ps, bt work


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbmips/conf/LOONGSON

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/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.30 src/sys/arch/evbmips/conf/LOONGSON:1.31
--- src/sys/arch/evbmips/conf/LOONGSON:1.30	Sun Feb 19 07:47:00 2017
+++ src/sys/arch/evbmips/conf/LOONGSON	Thu May 11 07:56:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.30 2017/02/19 07:47:00 rin Exp $
+# $NetBSD: LOONGSON,v 1.31 2017/05/11 07:56:43 maya Exp $
 #
 # LOONGSON machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/evbmips/conf/std.loongson
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"LOONGSON-$Revision: 1.30 $"
+#ident 		"LOONGSON-$Revision: 1.31 $"
 
 maxusers	16
 
@@ -36,6 +36,7 @@ options 	DIAGNOSTIC		# extra kernel debu
 #options 	PMAP_FAULTINFO
 #options 	LOCKDEBUG
 makeoptions	DEBUG="-g"
+makeoptions	COPY_SYMTAB=1		# size for embedded symbol table
 options 	KTRACE			# system call tracing support
 options 	MSGBUFSIZE=8192		# dmesg buffer size
 

CVS commit: src/sys/arch/evbmips/conf

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Thu May 11 07:56:43 UTC 2017

Modified Files:
src/sys/arch/evbmips/conf: LOONGSON

Log Message:
COPY_SYMTAB=1 so ddb commands ps, bt work


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbmips/conf/LOONGSON

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

CVS commit: src/sys/modules/lua

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Thu May 11 07:34:27 UTC 2017

Modified Files:
src/sys/modules/lua: lua.c

Log Message:
Avoid possible null pointer dereferencing.
Fixes PR kern/52225.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/modules/lua/lua.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/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.20 src/sys/modules/lua/lua.c:1.21
--- src/sys/modules/lua/lua.c:1.20	Sun Apr 16 17:45:12 2017
+++ src/sys/modules/lua/lua.c	Thu May 11 07:34:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua.c,v 1.20 2017/04/16 17:45:12 riastradh Exp $ */
+/*	$NetBSD: lua.c,v 1.21 2017/05/11 07:34:27 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2014 by Lourival Vieira Neto .
@@ -335,10 +335,12 @@ luaioctl(dev_t dev, u_long cmd, void *da
 			}
 
 		K = kluaL_newstate(create->name, create->desc, IPL_NONE);
-		K->ks_user = true;
 
 		if (K == NULL)
 			return ENOMEM;
+
+		K->ks_user = true;
+
 		if (lua_verbose)
 			device_printf(sc->sc_dev, "state %s created\n",
 			create->name);

CVS commit: src/sys/modules/lua

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Thu May 11 07:34:27 UTC 2017

Modified Files:
src/sys/modules/lua: lua.c

Log Message:
Avoid possible null pointer dereferencing.
Fixes PR kern/52225.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/modules/lua/lua.c

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

CVS commit: src/share/misc

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Thu May 11 06:46:45 UTC 2017

Modified Files:
src/share/misc: airport

Log Message:
fix TIA entry


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/share/misc/airport

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

Modified files:

Index: src/share/misc/airport
diff -u src/share/misc/airport:1.64 src/share/misc/airport:1.65
--- src/share/misc/airport:1.64	Thu Apr  6 19:53:36 2017
+++ src/share/misc/airport	Thu May 11 06:46:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.64 2017/04/06 19:53:36 mbalmer Exp $
+#	$NetBSD: airport,v 1.65 2017/05/11 06:46:45 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -7601,7 +7601,7 @@ THV:York Airport, PA, USA
 THX:Turukhansk, Krasnoyarsk Krai, Russia
 THY:Thohoyandou, Venda, South Africa
 THZ:Tahoua, Niger
-TIA:Tirana, Albania
+TIA:Tirana International Airport, Albania
 TIB:Tibu, Colombia
 TIC:Tinak Airport, Marshall Islands
 TID:Tiaret (Bou Chekif), Algeria

CVS commit: src/share/misc

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Thu May 11 06:46:45 UTC 2017

Modified Files:
src/share/misc: airport

Log Message:
fix TIA entry


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/share/misc/airport

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