CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Jun 13 05:56:44 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Cleanup whitespace To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-9.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-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.65 src/doc/CHANGES-9.1:1.1.2.66 --- src/doc/CHANGES-9.1:1.1.2.65 Thu Jun 11 11:04:11 2020 +++ src/doc/CHANGES-9.1 Sat Jun 13 05:56:44 2020 @@ -1,13 +1,13 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.65 2020/06/11 11:04:11 jdc Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.66 2020/06/13 05:56:44 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: -external/gpl2/groff/tmac/mdoc.local patched by hand -sys/sys/param.h patched by hand +external/gpl2/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand -Welcome to 9.0_STABLE. -[martin] + Welcome to 9.0_STABLE. + [martin] external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c 1.57 @@ -29,7 +29,7 @@ sys/arch/hpcmips/hpcmips/hpcapm_machdep. Fix spelling in comments. [sevan, ticket #712] -lib/libdm/libdm_ioctl.c1.4 +lib/libdm/libdm_ioctl.c 1.4 Do not write temporary files to fixed paths in /tmp. [riastradh, ticket #713] @@ -40,7 +40,7 @@ crypto/external/bsd/openssl/dist/crypto/ into child processes. [riastradh, ticket #714] -external/cddl/osnet/dist/cmd/zpool/zpool_vdev.c 1.5 +external/cddl/osnet/dist/cmd/zpool/zpool_vdev.c 1.5 zpool: The NetBSD specific ioctl needs to include sys/ioctl.h. [riastradh, ticket #715] @@ -67,7 +67,7 @@ sys/dev/sdmmc/sdmmc_cis.c 1.6,1.8 sys/dev/sdmmc/sdmmc_io.c 1.15-1.19 sys/dev/sdmmc/sdmmc_ioreg.h 1.4,1.5 sys/dev/sdmmc/sdmmc_mem.c 1.69-1.71 -sys/dev/sdmmc/sdmmcdevs1.5-1.8 +sys/dev/sdmmc/sdmmcdevs 1.5-1.8 sys/dev/sdmmc/sdmmcvar.h 1.31,1.33,1.34 sys/net/if_media.h1.66 sys/dev/sdmmc/sdmmcdevs.h (regen) @@ -140,7 +140,7 @@ sys/arch/powerpc/ibm4xx/dev/com_opb.c 1 Fix a panic during attach of com(4) for powerpc/ibm4xx peripheral. [rin, ticket #728] -sys/arch/powerpc/include/intr.h 1.15 +sys/arch/powerpc/include/intr.h 1.15 Fix !__HAVE_FAST_SOFTINTS build for debugging. [rin, ticket #729] @@ -207,7 +207,7 @@ sys/arch/powerpc/powerpc/sig_machdep.c [rin, ticket #736] sys/arch/powerpc/powerpc/locore_subr.S 1.60 -sys/arch/powerpc/powerpc/trap.c 1.157 +sys/arch/powerpc/powerpc/trap.c 1.157 Comment out do_ucas_32(), only user of which, _ucas_32(), is commented out since powerpc/trap.c rev 1.156. @@ -219,7 +219,7 @@ usr.sbin/postinstall/postinstall.in 1.1 /etc/motd (http->https). [nakayama, ticket #738] -sys/ufs/ufs/ufs_vnops.c1.249 +sys/ufs/ufs/ufs_vnops.c 1.249 Zero out the padding in 'd_namlen', to prevent info leaks. [maxv, ticket #739] @@ -262,7 +262,7 @@ sys/dev/usb/usbdi.h1.99-1.101 sys/dev/usb/usbdivar.h1.121,1.122 sys/dev/usb/xhci.c1.116-1.118 sys/external/bsd/dwc2/dwc2.c 1.67-1.71 -sys/external/bsd/dwc2/dwc2var.h 1.7 +sys/external/bsd/dwc2/dwc2var.h 1.7 Fix various race conditions in USB abort and timeout. [riastradh, ticket #744] @@ -307,7 +307,7 @@ sys/arch/cobalt/dev/gt.c 1.30 Fix mapping of the PCI I/O space. [thorpej, ticket #751] -sys/arch/powerpc/booke/copyin.c 1.8 +sys/arch/powerpc/booke/copyin.c 1.8 Let copyinstr(9) return ENAMETOOLONG correctly if source is not NUL-terminated. @@ -327,14 +327,14 @@ sys/kern/files.kern1.44 common/lib/libc/arch/powerpc/atomic/atomic_cas.S 1.9 common/lib/libc/arch/powerpc/atomic/atomic_op_asm.h 1.7 common/lib/libc/arch/powerpc/atomic/atomic_swap.S 1.8 -sys/arch/evbppc/conf/std.obs200 1.5 -sys/arch/evbppc/conf/std.obs266 1.3 -sys/arch/evbppc/conf/std.virtex 1.4 -sys/arch/evbppc/conf/std.walnut 1.9 -sys/arch/powerpc/ibm4xx/4xx_trap_subr.S 1.8 +sys/arch/evbppc/conf/std.obs200 1.5 +sys/arch/evbppc/conf/std.obs266 1.3 +sys/arch/evbppc/conf/std.virtex 1.4 +sys/arch/evbppc/conf/std.walnut 1.9 +sys/arch/powerpc/ibm4xx/4xx_trap_subr.S 1.8 sys/arch/powerpc/ibm4xx/trap_subr.S 1.28 sys/arch/powerpc/include/asm.h 1.49 -sys/arch/powerpc/include/lock.h 1.15 +sys/arch/powerpc/include/lock.h 1.15 sys/arch/powerpc/powerpc/lock_stubs.S 1.12 sys/arch/powerpc/powerpc/locore_subr.S 1.61 sys/arch/powerpc/powerpc/trap_subr.S 1.81 @@ -378,7 +378,7 @@ sys/compat/netbsd32/syscalls.master 1.1 sys/compat/netbsd32/netbsd32_syscallargs.h (regen) sys/compat/netbsd32/netbsd32_syscall.h (regen) sys/compat/netbsd32/netbsd32_sysent.c (regen) -sys/compat/netbsd32/netbsd32_syscalls.c (regen) +sys/compat/netbsd32/netbsd32_syscalls.c (regen) sys/compat/netbsd32/netbsd32_syscalls_autoload.c (regen) sys/compat/netbsd32/netbsd32_systrace_args.c (regen) @@ -394,7
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: jdc
Date: Sat Jun 13 05:31:29 UTC 2020
Modified Files:
src/sys/arch/sparc/dev: tctrl.c
Log Message:
Initialise the mutex before we use it.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sparc/dev/tctrl.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/sparc/dev/tctrl.c
diff -u src/sys/arch/sparc/dev/tctrl.c:1.61 src/sys/arch/sparc/dev/tctrl.c:1.62
--- src/sys/arch/sparc/dev/tctrl.c:1.61 Wed Oct 25 08:12:37 2017
+++ src/sys/arch/sparc/dev/tctrl.c Sat Jun 13 05:31:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tctrl.c,v 1.61 2017/10/25 08:12:37 maya Exp $ */
+/* $NetBSD: tctrl.c,v 1.62 2020/06/13 05:31:28 jdc Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.61 2017/10/25 08:12:37 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.62 2020/06/13 05:31:28 jdc Exp $");
#include
#include
@@ -260,6 +260,8 @@ tctrl_attach(device_t parent, device_t s
sc->sc_tft_on = 1;
+ mutex_init(>sc_requestlock, MUTEX_DEFAULT, IPL_NONE);
+
/* clear any pending data.
*/
for (i = 0; i < 1; i++) {
@@ -312,7 +314,6 @@ tctrl_attach(device_t parent, device_t s
sc->sc_ext_pending = 0;
sc->sc_ext_pending = 0;
- mutex_init(>sc_requestlock, MUTEX_DEFAULT, IPL_NONE);
selinit(>sc_rsel);
/* setup sensors and register the power button */
CVS commit: src/sys/netinet
Module Name:src
Committed By: roy
Date: Sat Jun 13 01:41:59 UTC 2020
Modified Files:
src/sys/netinet: sctp_output.c
Log Message:
SCTP: Use ifp->if_mtu rather than ND_IFINFO(ifp)->linkmtu
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/netinet/sctp_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.21 src/sys/netinet/sctp_output.c:1.22
--- src/sys/netinet/sctp_output.c:1.21 Thu Dec 26 04:44:10 2019
+++ src/sys/netinet/sctp_output.c Sat Jun 13 01:41:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_output.c,v 1.21 2019/12/26 04:44:10 msaitoh Exp $ */
+/* $NetBSD: sctp_output.c,v 1.22 2020/06/13 01:41:59 roy Exp $ */
/* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.21 2019/12/26 04:44:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.22 2020/06/13 01:41:59 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -2476,11 +2476,11 @@ sctp_lowlevel_chunk_output(struct sctp_i
}
rtcache_unref(rt, ro);
} else if (ifp) {
-if (ND_IFINFO(ifp)->linkmtu &&
-(stcb->asoc.smallest_mtu > ND_IFINFO(ifp)->linkmtu)) {
+if (ifp->if_mtu &&
+(stcb->asoc.smallest_mtu > ifp->if_mtu)) {
sctp_mtu_size_reset(inp,
>asoc,
- ND_IFINFO(ifp)->linkmtu);
+ ifp->if_mtu);
}
}
}
CVS commit: src/usr.sbin/ndp
Module Name:src Committed By: roy Date: Fri Jun 12 21:08:02 UTC 2020 Modified Files: src/usr.sbin/ndp: ndp.8 ndp.c Log Message: ndp: Sync usage and SYNPOSIS with reality To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/ndp/ndp.8 cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/ndp/ndp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/ndp/ndp.8 diff -u src/usr.sbin/ndp/ndp.8:1.30 src/usr.sbin/ndp/ndp.8:1.31 --- src/usr.sbin/ndp/ndp.8:1.30 Fri Jun 12 11:04:46 2020 +++ src/usr.sbin/ndp/ndp.8 Fri Jun 12 21:08:02 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: ndp.8,v 1.30 2020/06/12 11:04:46 roy Exp $ +.\" $NetBSD: ndp.8,v 1.31 2020/06/12 21:08:02 roy Exp $ .\" $KAME: ndp.8,v 1.33 2005/10/19 14:57:42 suz Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -42,7 +42,7 @@ .Ar hostname .Nm ndp .Op Fl nt -.Fl a | Fl c | Fl p +.Fl a | Fl c .Nm ndp .Op Fl nt .Fl A Ar wait Index: src/usr.sbin/ndp/ndp.c diff -u src/usr.sbin/ndp/ndp.c:1.56 src/usr.sbin/ndp/ndp.c:1.57 --- src/usr.sbin/ndp/ndp.c:1.56 Fri Jun 12 11:04:46 2020 +++ src/usr.sbin/ndp/ndp.c Fri Jun 12 21:08:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ndp.c,v 1.56 2020/06/12 11:04:46 roy Exp $ */ +/* $NetBSD: ndp.c,v 1.57 2020/06/12 21:08:02 roy Exp $ */ /* $KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $ */ /* @@ -695,7 +695,7 @@ usage(void) (void)fprintf(stderr, "Usage: %s [-nt] hostname\n", pn); (void)fprintf(stderr, - " %s [-nt] -a | -c | -p | -r | -H | -P | -R\n", pn); + " %s [-nt] -a | -c\n", pn); (void)fprintf(stderr, " %s [-nt] -A wait\n", pn); (void)fprintf(stderr, " %s [-nt] -d hostname\n", pn); (void)fprintf(stderr, " %s [-nt] -f filename\n", pn);
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Jun 12 20:58:43 UTC 2020 Modified Files: src/share/man/man4: bpf.4 Log Message: Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/share/man/man4/bpf.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/bpf.4 diff -u src/share/man/man4/bpf.4:1.62 src/share/man/man4/bpf.4:1.63 --- src/share/man/man4/bpf.4:1.62 Thu Jun 11 13:36:20 2020 +++ src/share/man/man4/bpf.4 Fri Jun 12 20:58:43 2020 @@ -1,6 +1,6 @@ .\" -*- nroff -*- .\" -.\" $NetBSD: bpf.4,v 1.62 2020/06/11 13:36:20 roy Exp $ +.\" $NetBSD: bpf.4,v 1.63 2020/06/12 20:58:43 wiz Exp $ .\" .\" Copyright (c) 1990, 1991, 1992, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -263,7 +263,9 @@ for an explanation of the filter languag .It Dv BIOCSETWF ( struct bpf_program ) Sets the write filter program used by the kernel to control what type of packets can be written to the interface. -See the BIOCSETF command for more information on the bpf filter program. +See the +.Dv BIOCSETF +command for more information on the bpf filter program. .It Dv BIOCVERSION ( struct bpf_version ) Returns the major and minor version numbers of the filter language currently recognized by the kernel.
CVS commit: src/sys/dev
Module Name:src
Committed By: thorpej
Date: Fri Jun 12 15:34:20 UTC 2020
Modified Files:
src/sys/dev/cardbus: cardbus.c
src/sys/dev/ic: ath.c
Log Message:
pmf-powerdown == false --> pmf-no-powerdown == true
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/ic/ath.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/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.109 src/sys/dev/cardbus/cardbus.c:1.110
--- src/sys/dev/cardbus/cardbus.c:1.109 Sun Nov 10 21:16:34 2019
+++ src/sys/dev/cardbus/cardbus.c Fri Jun 12 15:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.109 2019/11/10 21:16:34 chs Exp $ */
+/* $NetBSD: cardbus.c,v 1.110 2020/06/12 15:34:20 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.109 2019/11/10 21:16:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.110 2020/06/12 15:34:20 thorpej Exp $");
#include "opt_cardbus.h"
@@ -775,7 +775,7 @@ enable_function(struct cardbus_softc *sc
static void
disable_function(struct cardbus_softc *sc, int function)
{
- bool powerdown;
+ bool no_powerdown;
cardbus_devfunc_t ct;
device_t dv;
int i;
@@ -788,7 +788,7 @@ disable_function(struct cardbus_softc *s
continue;
dv = ct->ct_device;
if (prop_dictionary_get_bool(device_properties(dv),
- "pmf-powerdown", ) && !powerdown)
+ "pmf-no-powerdown", _powerdown) && no_powerdown)
return;
}
/* power-off because no functions are enabled */
Index: src/sys/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.130 src/sys/dev/ic/ath.c:1.131
--- src/sys/dev/ic/ath.c:1.130 Wed Jan 29 14:09:58 2020
+++ src/sys/dev/ic/ath.c Fri Jun 12 15:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.130 2020/01/29 14:09:58 thorpej Exp $ */
+/* $NetBSD: ath.c,v 1.131 2020/06/12 15:34:20 thorpej Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.130 2020/01/29 14:09:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.131 2020/06/12 15:34:20 thorpej Exp $");
#endif
/*
@@ -307,7 +307,7 @@ ath_attach(u_int16_t devid, struct ath_s
sc->sc_ah = ah;
if (!prop_dictionary_set_bool(device_properties(sc->sc_dev),
- "pmf-powerdown", false))
+ "pmf-no-powerdown", true))
goto bad;
/*
CVS commit: src/sys/compat/netinet6
Module Name:src
Committed By: roy
Date: Fri Jun 12 15:25:27 UTC 2020
Added Files:
src/sys/compat/netinet6: nd6.h
Log Message:
Add nd6.h compat header
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/compat/netinet6/nd6.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/compat/netinet6/nd6.h
diff -u /dev/null src/sys/compat/netinet6/nd6.h:1.1
--- /dev/null Fri Jun 12 15:25:27 2020
+++ src/sys/compat/netinet6/nd6.h Fri Jun 12 15:25:26 2020
@@ -0,0 +1,120 @@
+/* $NetBSD: nd6.h,v 1.1 2020/06/12 15:25:26 roy Exp $ */
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Roy Marples.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _COMPAT_NETINET6_ND6_H_
+#define _COMPAT_NETINET6_ND6_H_
+
+struct nd_ifinfo90 {
+ u_int32_t linkmtu; /* LinkMTU */
+ u_int32_t maxmtu; /* Upper bound of LinkMTU */
+ u_int32_t basereachable; /* BaseReachableTime */
+ u_int32_t reachable; /* Reachable Time */
+ u_int32_t retrans; /* Retrans Timer */
+ u_int32_t flags; /* Flags */
+ int recalctm; /* BaseReacable re-calculation timer */
+ u_int8_t chlim; /* CurHopLimit */
+ u_int8_t initialized; /* Flag to see the entry is initialized */
+ /* the following 3 members are for privacy extension for addrconf */
+ u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */
+ u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */
+ u_int8_t randomid[8]; /* current random ID */
+};
+
+struct in6_ondireq {
+ char ifname[IFNAMSIZ];
+ struct {
+ u_int32_t linkmtu; /* LinkMTU */
+ u_int32_t maxmtu; /* Upper bound of LinkMTU */
+ u_int32_t basereachable; /* BaseReachableTime */
+ u_int32_t reachable; /* Reachable Time */
+ u_int32_t retrans; /* Retrans Timer */
+ u_int32_t flags; /* Flags */
+ int recalctm; /* BaseReacable re-calculation timer */
+ u_int8_t chlim; /* CurHopLimit */
+ u_int8_t receivedra;
+ } ndi;
+};
+
+struct in6_ndireq90 {
+ char ifname[IFNAMSIZ];
+ struct nd_ifinfo90 ndi;
+};
+
+struct in6_ndifreq90 {
+ char ifname[IFNAMSIZ];
+ u_long ifindex;
+};
+
+#define DRLSTSIZ 10
+#define PRLSTSIZ 10
+struct in6_drlist {
+ char ifname[IFNAMSIZ];
+ struct {
+ struct in6_addr rtaddr;
+ u_char flags;
+ u_short rtlifetime;
+ u_long expire;
+ u_short if_index;
+ } defrouter[DRLSTSIZ];
+};
+
+struct in6_oprlist {
+ char ifname[IFNAMSIZ];
+ struct {
+ struct in6_addr prefix;
+ struct prf_ra raflags;
+ u_char prefixlen;
+ u_char origin;
+ u_long vltime;
+ u_long pltime;
+ u_long expire;
+ u_short if_index;
+ u_short advrtrs; /* number of advertisement routers */
+ struct in6_addr advrtr[DRLSTSIZ]; /* XXX: explicit limit */
+ } prefix[PRLSTSIZ];
+};
+
+struct in6_prlist {
+ char ifname[IFNAMSIZ];
+ struct {
+ struct in6_addr prefix;
+ struct prf_ra raflags;
+ u_char prefixlen;
+ u_char origin;
+ u_int32_t vltime;
+ u_int32_t pltime;
+ time_t expire;
+ u_short if_index;
+ u_short advrtrs; /* number of advertisement routers */
+ struct in6_addr advrtr[DRLSTSIZ]; /* XXX: explicit limit */
+ } prefix[PRLSTSIZ];
+};
+
+#endif /* !_COMPAT_NETINET6_ND6_H_ */
CVS commit: src/sys/dev/ofw
Module Name:src
Committed By: thorpej
Date: Fri Jun 12 14:52:11 UTC 2020
Modified Files:
src/sys/dev/ofw: ofw_subr.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ofw/ofw_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ofw/ofw_subr.c
diff -u src/sys/dev/ofw/ofw_subr.c:1.35 src/sys/dev/ofw/ofw_subr.c:1.36
--- src/sys/dev/ofw/ofw_subr.c:1.35 Thu Jun 11 02:39:30 2020
+++ src/sys/dev/ofw/ofw_subr.c Fri Jun 12 14:52:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_subr.c,v 1.35 2020/06/11 02:39:30 thorpej Exp $ */
+/* $NetBSD: ofw_subr.c,v 1.36 2020/06/12 14:52:11 thorpej Exp $ */
/*
* Copyright 1998
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.35 2020/06/11 02:39:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.36 2020/06/12 14:52:11 thorpej Exp $");
#include
#include
@@ -393,19 +393,14 @@ boolean_t
of_to_dataprop(prop_dictionary_t dict, int node, const char *ofname,
const char *propname)
{
- prop_data_t data;
int len;
uint8_t prop[256];
- boolean_t res;
len = OF_getprop(node, ofname, prop, 256);
if (len < 1)
return FALSE;
- data = prop_data_create_data(prop, len);
- res = prop_dictionary_set(dict, propname, data);
- prop_object_release(data);
- return res;
+ return prop_dictionary_set_data(dict, propname, prop, len);
}
/*
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src
Committed By: fox
Date: Fri Jun 12 14:37:51 UTC 2020
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
Log Message:
external/gpl3/gcc: Suppress -Werror=maybe-uninitialized
Seems like false positive since the ASM_GENERATE_INTERNAL_LABEL macro
stores the value into prev_label, so it is alright for prev_label to
be uninitialized.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/external/gpl3/gcc/usr.bin/backend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.57 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.58
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.57 Tue Oct 29 02:49:05 2019
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Fri Jun 12 14:37:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/10/29 02:49:05 christos Exp $
+# $NetBSD: Makefile,v 1.58 2020/06/12 14:37:51 fox Exp $
LIBISPRIVATE= yes
@@ -595,6 +595,8 @@ COPTS.tree.c= ${${ACTIVE_CC} == "clang"
CFLAGS+= -Wno-stack-protector
+COPTS.dwarf2out.c+=-Wno-error=maybe-uninitialized
+
.if ${GCC_MACHINE_ARCH} == "m68000" || ${GCC_MACHINE_ARCH} == "m68k" || \
${GCC_MACHINE_ARCH} == "coldfire"
COPTS.tree-loop-distribution.c+=-O2
CVS commit: src/etc/mtree
Module Name:src
Committed By: roy
Date: Fri Jun 12 14:12:20 UTC 2020
Modified Files:
src/etc/mtree: Makefile
Log Message:
Revert accidental part of prior
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/etc/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.43 src/etc/mtree/Makefile:1.44
--- src/etc/mtree/Makefile:1.43 Fri Jun 12 11:04:44 2020
+++ src/etc/mtree/Makefile Fri Jun 12 14:12:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/06/12 11:04:44 roy Exp $
+# $NetBSD: Makefile,v 1.44 2020/06/12 14:12:20 roy Exp $
.include
@@ -57,9 +57,9 @@ EXTRA_DIST_FILES+= NetBSD.dist.tests.com
.endif
.endif
-#.if ${MKDTB} != "no"
-#EXTRA_DIST_FILES+= NetBSD.dist.dtb
-#.endif
+.if ${MKDTB} != "no"
+EXTRA_DIST_FILES+= NetBSD.dist.dtb
+.endif
.if ${MKDTRACE} != "no"
EXTRA_DIST_FILES+= NetBSD.dist.dtrace
CVS commit: src/sys/arch/emips/include
Module Name:src Committed By: tsutsui Date: Fri Jun 12 11:21:36 UTC 2020 Modified Files: src/sys/arch/emips/include: disklabel.h Log Message: Remove unused OPENBSD_RAW_PART. (copied from arc?) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/emips/include/disklabel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/emips/include/disklabel.h diff -u src/sys/arch/emips/include/disklabel.h:1.5 src/sys/arch/emips/include/disklabel.h:1.6 --- src/sys/arch/emips/include/disklabel.h:1.5 Thu May 16 19:06:44 2013 +++ src/sys/arch/emips/include/disklabel.h Fri Jun 12 11:21:36 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.h,v 1.5 2013/05/16 19:06:44 christos Exp $ */ +/* $NetBSD: disklabel.h,v 1.6 2020/06/12 11:21:36 tsutsui Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -37,8 +37,7 @@ #define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ -#define RAW_PART 2 /* raw partition: ie. XX?c (XXX) */ -#define OPENBSD_RAW_PART 2 /* raw partition: XX?c */ +#define RAW_PART 2 /* raw partition: ie. XX?c */ /* Pull in MBR partition definitions. */ #if HAVE_NBTOOL_CONFIG_H
CVS commit: src/sys/sys
Module Name:src Committed By: roy Date: Fri Jun 12 11:09:49 UTC 2020 Modified Files: src/sys/sys: param.h Log Message: 9.99.66 welcomes the removal of in-kernel RA handling To generate a diff of this commit: cvs rdiff -u -r1.668 -r1.669 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.668 src/sys/sys/param.h:1.669 --- src/sys/sys/param.h:1.668 Sun Jun 7 06:08:20 2020 +++ src/sys/sys/param.h Fri Jun 12 11:09:49 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.668 2020/06/07 06:08:20 thorpej Exp $ */ +/* $NetBSD: param.h,v 1.669 2020/06/12 11:09:49 roy Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 999006500 /* NetBSD 9.99.65 */ +#define __NetBSD_Version__ 999006600 /* NetBSD 9.99.66 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Jun 12 11:07:43 UTC 2020 Modified Files: src/doc: CHANGES Log Message: Note removal of RA handling. To generate a diff of this commit: cvs rdiff -u -r1.2699 -r1.2700 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2699 src/doc/CHANGES:1.2700 --- src/doc/CHANGES:1.2699 Thu Jun 4 13:11:03 2020 +++ src/doc/CHANGES Fri Jun 12 11:07:43 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2699 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2700 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -217,3 +217,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: OpenSSH: Import 8.3. [christos 20200528] evbarm: Add install media for earmv7hf and aarch64. [jmcneill 20200528] dhcpcd: Import version 9.1.1 [roy 20200604] + inet6: in-kernel Router Advertisment handling removed. [roy 20200612]
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: roy
Date: Fri Jun 12 10:35:59 UTC 2020
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_fil_netbsd.c
Log Message:
ipfilter: Prepare for life without in kernel RA
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.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/external/bsd/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.34 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.35
--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.34 Fri Feb 21 00:26:22 2020
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Fri Jun 12 10:35:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.34 2020/02/21 00:26:22 joerg Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.35 2020/06/12 10:35:59 roy Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -8,7 +8,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.34 2020/02/21 00:26:22 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.35 2020/06/12 10:35:59 roy Exp $");
#else
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -1465,7 +1465,8 @@ ipf_fastroute6(struct mbuf *m0, struct m
}
{
-# if (__NetBSD_Version__ >= 10601) && !defined(IN6_LINKMTU)
+# if (__NetBSD_Version__ >= 10601) && !defined(IN6_LINKMTU) \
+ && defined(IPV6CTL_ACCEPT_RTADV)
struct in6_ifextra *ife;
# endif
if (rt->rt_flags & RTF_GATEWAY)
@@ -1479,13 +1480,15 @@ ipf_fastroute6(struct mbuf *m0, struct m
/* Determine path MTU. */
# if (__NetBSD_Version__ <= 10600)
mtu = nd_ifinfo[ifp->if_index].linkmtu;
-# else
+# elif defined(IPV6CTL_ACCEPT_RTADV)
# ifdef IN6_LINKMTU
mtu = IN6_LINKMTU(ifp);
# else
ife = (struct in6_ifextra *)(ifp)->if_afdata[AF_INET6];
mtu = ife->nd_ifinfo[ifp->if_index].linkmtu;
# endif
+# else
+ mtu = ifp->if_mtu;
# endif
if ((error == 0) && (m0->m_pkthdr.len <= mtu)) {
# if __NetBSD_Version__ >= 499001100
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Fri Jun 12 09:28:48 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
- Remove extra kpreempt_disable() -> kpreempt_enable() because
ixgbe_handle_msf() was changed from softint to workqueue.
- Set schedule_wqs_ok before enabling interrupt to prevent the race.
- Fix comment.
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.229 src/sys/dev/pci/ixgbe/ixgbe.c:1.230
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.229 Thu Jun 11 09:16:05 2020
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Jun 12 09:28:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.229 2020/06/11 09:16:05 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.230 2020/06/12 09:28:48 msaitoh Exp $ */
/**
@@ -1538,9 +1538,7 @@ ixgbe_config_link(struct adapter *adapte
ixgbe_schedule_msf_tasklet(adapter);
kpreempt_enable();
}
- kpreempt_disable();
softint_schedule(adapter->mod_si);
- kpreempt_enable();
} else {
struct ifmedia *ifm = >media;
@@ -4126,6 +4124,9 @@ ixgbe_init_locked(struct adapter *adapte
/* Setup DMA Coalescing */
ixgbe_config_dmac(adapter);
+ /* OK to schedule workqueues. */
+ adapter->schedule_wqs_ok = true;
+
/* And now turn on interrupts */
ixgbe_enable_intr(adapter);
@@ -4143,9 +4144,6 @@ ixgbe_init_locked(struct adapter *adapte
/* Now inform the stack we're ready */
ifp->if_flags |= IFF_RUNNING;
- /* OK to schedule workqueues. */
- adapter->schedule_wqs_ok = true;
-
return;
} /* ixgbe_init_locked */
@@ -4694,7 +4692,7 @@ ixgbe_handle_msf(struct work *wk, void *
/*
* Hold the IFNET_LOCK across this entire call. This will
- * prevent additional changes to adapter->phy_layer and
+ * prevent additional changes to adapter->phy_layer
* and serialize calls to this tasklet. We cannot hold the
* CORE_LOCK while calling into the ifmedia functions as
* they may block while allocating memory.
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: macallan
Date: Fri Jun 12 06:44:57 UTC 2020
Modified Files:
src/sys/arch/macppc/dev: ki2c.c
Log Message:
more proplib API catchup
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/macppc/dev/ki2c.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/macppc/dev/ki2c.c
diff -u src/sys/arch/macppc/dev/ki2c.c:1.29 src/sys/arch/macppc/dev/ki2c.c:1.30
--- src/sys/arch/macppc/dev/ki2c.c:1.29 Thu Jan 9 18:49:06 2020
+++ src/sys/arch/macppc/dev/ki2c.c Fri Jun 12 06:44:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ki2c.c,v 1.29 2020/01/09 18:49:06 macallan Exp $ */
+/* $NetBSD: ki2c.c,v 1.30 2020/06/12 06:44:57 macallan Exp $ */
/* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */
/*-
@@ -173,8 +173,8 @@ ki2c_attach(device_t parent, device_t se
addr = addr >> 1;
DPRINTF("-> %s@%x\n", name, addr);
dev = prop_dictionary_create();
- prop_dictionary_set_cstring(dev, "name", name);
- data = prop_data_create_data(compat, strlen(compat)+1);
+ prop_dictionary_set_string(dev, "name", name);
+ data = prop_data_create_copy(compat, strlen(compat)+1);
prop_dictionary_set(dev, "compatible", data);
prop_object_release(data);
prop_dictionary_set_uint32(dev, "addr", addr);
@@ -187,7 +187,7 @@ ki2c_attach(device_t parent, device_t se
goto nope;
DPRINTF("found '%s' at %02x\n", descr, reg);
snprintf(num, 7, "s%02x", reg);
-prop_dictionary_set_cstring(dev, num, descr);
+prop_dictionary_set_string(dev, num, descr);
nope:
devc = OF_peer(devc);
}
