CVS commit: src/doc
Module Name:src Committed By: ozaki-r Date: Tue Mar 26 05:17:17 UTC 2019 Modified Files: src/doc: TODO.smpnet Log Message: Add another known issue To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.27 src/doc/TODO.smpnet:1.28 --- src/doc/TODO.smpnet:1.27 Mon Jan 21 02:28:25 2019 +++ src/doc/TODO.smpnet Tue Mar 26 05:17:17 2019 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.27 2019/01/21 02:28:25 pgoyette Exp $ +$NetBSD: TODO.smpnet,v 1.28 2019/03/26 05:17:17 ozaki-r Exp $ MP-safe components == @@ -203,3 +203,29 @@ Makefile: CPPFLAGS+= NET_MPSAFE Failure to do this may result in unpredictable behavior. + +IPv4 address initialization atomicity +- + +An IPv4 address is referenced by several data structures: an associated +interface, its local route, a connected route (if necessary), the global list, +the global hash table, etc. These data structures are not updated atomically, +i.e., there can be inconsistent states on an IPv4 address in the kernel during +the initialization of an IPv4 address. + +One known failure of the issue is that incoming packets destinating to an +initializing address can loop in the network stack in a short period of time. +The address initialization creates an local route first and then registers an +initializing address to the global hash table that is used to decide if an +incoming packet destinates to the host by checking the destination of the packet +is registered to the hash table. So, if the host allows forwaring, an incoming +packet can match on a local route of an initializing address at ip_output while +it fails the to-self check described above at ip_input. Because a matched local +route points a loopback interface as its destination interface, an incoming +packet sends to the network stack (ip_input) again, which results in looping. +The loop stops once an initializing address is registered to the hash table. + +One solution of the issue is to reorder the address initialization instructions, +first register an address to the hash table then create its routes. Another +solution is to use the routing table for the to-self check instead of using the +global hash table, like IPv6.
CVS commit: src/sys/compat/linux/arch/alpha
Module Name:src
Committed By: christos
Date: Tue Mar 26 02:05:28 UTC 2019
Modified Files:
src/sys/compat/linux/arch/alpha: linux_osf1.c
Log Message:
make this compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/linux/arch/alpha/linux_osf1.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/compat/linux/arch/alpha/linux_osf1.c
diff -u src/sys/compat/linux/arch/alpha/linux_osf1.c:1.1 src/sys/compat/linux/arch/alpha/linux_osf1.c:1.2
--- src/sys/compat/linux/arch/alpha/linux_osf1.c:1.1 Sun Mar 24 12:24:19 2019
+++ src/sys/compat/linux/arch/alpha/linux_osf1.c Mon Mar 25 22:05:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_osf1.c,v 1.1 2019/03/24 16:24:19 maxv Exp $ */
+/* $NetBSD: linux_osf1.c,v 1.2 2019/03/26 02:05:28 christos Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_osf1.c,v 1.1 2019/03/24 16:24:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_osf1.c,v 1.2 2019/03/26 02:05:28 christos Exp $");
#include
#include
@@ -419,7 +419,7 @@ linux_sys_osf1_gettimeofday(struct lwp *
memset(, 0, sizeof otv);
otv.tv_sec = tv.tv_sec;
otv.tv_usec = tv.tv_usec;
- error = copyout(, SCARG(uap, tp), sizeof otv);
+ error = copyout(, SCARG(uap, tv), sizeof otv);
if (error == 0 && SCARG(uap, tzp) != NULL) {
memset(, 0, sizeof otz);
CVS commit: src
Module Name:src
Committed By: pgoyette
Date: Tue Mar 26 00:36:14 UTC 2019
Modified Files:
src/distrib/sets/lists/modules: mi
src/sys/modules: Makefile
Added Files:
src/sys/modules/srt: Makefile srt.c
Log Message:
Now that the if_srt module has a chance of working (ie, it now
actually attaches/detaches the cdevsw!), add the required srt
module to allow module autoload triggered by opening /dev/srtN
XXX As noted in the recent commit to if_srt.c, someone(tm) needs
XXX to create the /dev/srt* device nodes with major 179. :)
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.220 -r1.221 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/srt/Makefile src/sys/modules/srt/srt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.120 src/distrib/sets/lists/modules/mi:1.121
--- src/distrib/sets/lists/modules/mi:1.120 Sun Mar 24 11:20:26 2019
+++ src/distrib/sets/lists/modules/mi Tue Mar 26 00:36:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.120 2019/03/24 11:20:26 pgoyette Exp $
+# $NetBSD: mi,v 1.121 2019/03/26 00:36:14 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -392,6 +392,8 @@
./@MODULEDIR@/spkr_synch base-obsolete obsolete
./@MODULEDIR@/sppp_subrbase-kernel-modules kmod
./@MODULEDIR@/sppp_subr/sppp_subr.kmod base-kernel-modules kmod
+./@MODULEDIR@/srtbase-kernel-modules kmod
+./@MODULEDIR@/srt/srt.kmod base-kernel-modules kmod
./@MODULEDIR@/suserbase-kernel-modules kmod
./@MODULEDIR@/suser/suser.kmod base-kernel-modules kmod
./@MODULEDIR@/swcryptobase-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.220 src/sys/modules/Makefile:1.221
--- src/sys/modules/Makefile:1.220 Sun Mar 24 11:20:26 2019
+++ src/sys/modules/Makefile Tue Mar 26 00:36:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.220 2019/03/24 11:20:26 pgoyette Exp $
+# $NetBSD: Makefile,v 1.221 2019/03/26 00:36:14 pgoyette Exp $
.include
@@ -84,7 +84,7 @@ SUBDIR+= if_ppp
SUBDIR+= if_pppoe
SUBDIR+= if_sl
SUBDIR+= if_smsc
-SUBDIR+= if_srt
+SUBDIR+= if_srt srt
SUBDIR+= if_stf
SUBDIR+= if_strip
SUBDIR+= if_tap tap
Added files:
Index: src/sys/modules/srt/Makefile
diff -u /dev/null src/sys/modules/srt/Makefile:1.1
--- /dev/null Tue Mar 26 00:36:14 2019
+++ src/sys/modules/srt/Makefile Tue Mar 26 00:36:14 2019
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2019/03/26 00:36:14 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+KMOD= srt
+SRCS= srt.c
+
+.include
Index: src/sys/modules/srt/srt.c
diff -u /dev/null src/sys/modules/srt/srt.c:1.1
--- /dev/null Tue Mar 26 00:36:14 2019
+++ src/sys/modules/srt/srt.c Tue Mar 26 00:36:14 2019
@@ -0,0 +1,51 @@
+/* $NetBSD: srt.c,v 1.1 2019/03/26 00:36:14 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2016 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Paul Goyette
+ *
+ * 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.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: srt.c,v 1.1 2019/03/26 00:36:14 pgoyette Exp $");
+
+#include
+#include
+
+MODULE(MODULE_CLASS_DRIVER, srt, "if_srt");
+
+static int
+srt_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ case MODULE_CMD_FINI:
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
CVS commit: src/sys/net
Module Name:src
Committed By: pgoyette
Date: Tue Mar 26 00:23:32 UTC 2019
Modified Files:
src/sys/net: if_srt.c
Log Message:
Add devsw_{attach,detach} stuff for _MODULE variant. (Not needed for
built-in variant since the devsw is also built-in.) This will allow
the modular srt devices to be accessed via open(2) and ioctl(2).
XXX Someone(tm) needs to update MAKEDEV to create the /dev/srtN device
nodes (with device-major 179)!
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/net/if_srt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_srt.c
diff -u src/sys/net/if_srt.c:1.27 src/sys/net/if_srt.c:1.28
--- src/sys/net/if_srt.c:1.27 Mon Oct 23 09:32:55 2017
+++ src/sys/net/if_srt.c Tue Mar 26 00:23:32 2019
@@ -1,8 +1,8 @@
-/* $NetBSD: if_srt.c,v 1.27 2017/10/23 09:32:55 msaitoh Exp $ */
+/* $NetBSD: if_srt.c,v 1.28 2019/03/26 00:23:32 pgoyette Exp $ */
/* This file is in the public domain. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.27 2017/10/23 09:32:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.28 2019/03/26 00:23:32 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -64,6 +64,29 @@ static unsigned int global_flags;
static u_int srt_count;
+#ifdef _MODULE
+devmajor_t srt_bmajor = -1, srt_cmajor = -1;
+#endif
+
+static int srt_open(dev_t, int, int, struct lwp *);
+static int srt_close(dev_t, int, int, struct lwp *);
+static int srt_ioctl(dev_t, u_long, void *, int, struct lwp *);
+
+const struct cdevsw srt_cdevsw = {
+ .d_open = srt_open,
+ .d_close = srt_close,
+ .d_read = nullread,
+ .d_write = nullwrite,
+ .d_ioctl = srt_ioctl,
+ .d_stop = nullstop,
+ .d_tty = notty,
+ .d_poll = nullpoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nullkqfilter,
+ .d_discard = nodiscard,
+ .d_flag = D_OTHER
+};
+
/* Internal routines. */
static unsigned int ipv4_masks[33] = {
@@ -332,6 +355,9 @@ srtinit(void)
softcv[i] = 0;
global_flags = 0;
if_clone_attach(_clone);
+#ifdef _MODULE
+ devsw_attach("srt", NULL, _bmajor, _cdevsw, _cmajor);
+#endif
}
static int
@@ -340,15 +366,26 @@ srtdetach(void)
int error = 0;
int i;
+ if_clone_detach(_clone);
+#ifdef _MODULE
+ devsw_detach(NULL, _cdevsw);
+ if (error != 0) {
+ if_clone_attach(_clone);
+ return error;
+ }
+#endif
+
for (i = SRT_MAXUNIT; i >= 0; i--)
if(softcv[i]) {
error = EBUSY;
+#ifdef _MODULE
+ devsw_attach("srt", NULL, _bmajor,
+ _cdevsw, _cmajor);
+#endif
+ if_clone_attach(_clone);
break;
}
- if (error == 0)
- if_clone_detach(_clone);
-
return error;
}
@@ -533,21 +570,6 @@ srt_ioctl(dev_t dev, u_long cmd, void *d
return ENOTTY;
}
-const struct cdevsw srt_cdevsw = {
- .d_open = srt_open,
- .d_close = srt_close,
- .d_read = nullread,
- .d_write = nullwrite,
- .d_ioctl = srt_ioctl,
- .d_stop = nullstop,
- .d_tty = notty,
- .d_poll = nullpoll,
- .d_mmap = nommap,
- .d_kqfilter = nullkqfilter,
- .d_discard = nodiscard,
- .d_flag = D_OTHER
-};
-
/*
* Module infrastructure
*/
CVS commit: src/usr.sbin/srtconfig
Module Name:src
Committed By: pgoyette
Date: Mon Mar 25 23:43:57 UTC 2019
Modified Files:
src/usr.sbin/srtconfig: srtconfig.c
Log Message:
Fix open() error message - use a colon rather than a semicolon to match
the other error messages
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/srtconfig/srtconfig.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/srtconfig/srtconfig.c
diff -u src/usr.sbin/srtconfig/srtconfig.c:1.4 src/usr.sbin/srtconfig/srtconfig.c:1.5
--- src/usr.sbin/srtconfig/srtconfig.c:1.4 Thu May 4 16:26:09 2017
+++ src/usr.sbin/srtconfig/srtconfig.c Mon Mar 25 23:43:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: srtconfig.c,v 1.4 2017/05/04 16:26:09 sevan Exp $ */
+/* $NetBSD: srtconfig.c,v 1.5 2019/03/25 23:43:56 pgoyette Exp $ */
/* This file is in the public domain. */
#include
@@ -99,7 +99,7 @@ static void open_dev(int how)
}
devfd = open(txt_dev,how,0);
if (devfd < 0)
- { fprintf(stderr,"%s; can't open %s: %s\n",__progname,txt_dev,strerror(errno));
+ { fprintf(stderr,"%s: can't open %s: %s\n",__progname,txt_dev,strerror(errno));
exit(1);
}
}
CVS commit: src/external/bsd
Module Name:src Committed By: christos Date: Mon Mar 25 22:24:54 UTC 2019 Modified Files: src/external/bsd: Makefile Log Message: descend into jemalloc too. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/external/bsd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/Makefile diff -u src/external/bsd/Makefile:1.61 src/external/bsd/Makefile:1.62 --- src/external/bsd/Makefile:1.61 Sat Sep 8 10:11:10 2018 +++ src/external/bsd/Makefile Mon Mar 25 18:24:54 2019 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.61 2018/09/08 14:11:10 christos Exp $ +# $NetBSD: Makefile,v 1.62 2019/03/25 22:24:54 christos Exp $ .include SUBDIR= acpica am-utils bc byacc cron dhcpcd ekermit elftosb \ - fetch file flex less \ + fetch file flex jemalloc less \ libarchive libevent liblzf libpcap mdocml \ ntp openresolv tcpdump tmux top tre wpa
CVS commit: src/sbin/gpt
Module Name:src
Committed By: martin
Date: Mon Mar 25 20:15:49 UTC 2019
Modified Files:
src/sbin/gpt: gpt.8 set.c
Log Message:
Allow -b startsec to specify the partition to change for the set subcommand
as well.
Add another option, -N, as a quick way to remove all attributes.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.14 -r1.15 src/sbin/gpt/set.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/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.65 src/sbin/gpt/gpt.8:1.66
--- src/sbin/gpt/gpt.8:1.65 Sun Mar 24 13:45:35 2019
+++ src/sbin/gpt/gpt.8 Mon Mar 25 20:15:49 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpt.8,v 1.65 2019/03/24 13:45:35 martin Exp $
+.\" $NetBSD: gpt.8,v 1.66 2019/03/25 20:15:49 martin Exp $
.\"
.\" Copyright (c) 2002 Marcel Moolenaar
.\" All rights reserved.
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
.\"
-.Dd March 24, 2019
+.Dd March 25, 2019
.Dt GPT 8
.Os
.Sh NAME
@@ -555,7 +555,8 @@ the partitions fit, as
will automatically adjust.
However, the new disk must use the same sector size as the old disk.
.\" set
-.It Nm Ic set Fl a Ar attribute Fl i Ar index
+.It Nm Ic set Oo Fl a Ar attribute Oc Oo Fl N Oc Oo Fl i Ar index Oc \
+Oo Fl b Ar startsec Oc
.It Nm Ic set Fl l
The
.Ic set
@@ -567,9 +568,16 @@ The
.Fl a
option specifies which attributes to set and may be specified more than once,
or the attributes can be comma-separated.
+If the
+.Fl N
+option and no
+.Fl a
+option are specified, all attributes are removed.
The
.Fl i
-option specifies which entry to update.
+or the
+.Fl b
+option specify which entry to update.
The possible attributes are
.Do biosboot Dc ,
.Do bootme Dc ,
Index: src/sbin/gpt/set.c
diff -u src/sbin/gpt/set.c:1.14 src/sbin/gpt/set.c:1.15
--- src/sbin/gpt/set.c:1.14 Mon Mar 19 09:06:20 2018
+++ src/sbin/gpt/set.c Mon Mar 25 20:15:49 2019
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: set.c,v 1.14 2018/03/19 09:06:20 mlelstv Exp $");
+__RCSID("$NetBSD: set.c,v 1.15 2019/03/25 20:15:49 martin Exp $");
#endif
#include
@@ -52,7 +52,8 @@ __RCSID("$NetBSD: set.c,v 1.14 2018/03/1
static int cmd_set(gpt_t, int, char *[]);
static const char *sethelp[] = {
- "-a attribute -i index",
+ "-a attribute [-i index] [-b startsec]",
+ "-N [-i index] [-b startsec]",
"-l",
};
@@ -70,14 +71,20 @@ cmd_set(gpt_t gpt, int argc, char *argv[
{
int ch;
unsigned int entry = 0;
- uint64_t attributes = 0;
+ uint64_t attributes = 0, clear = 0;
+ off_t start = 0;
+ map_t m;
- while ((ch = getopt(argc, argv, "a:i:l")) != -1) {
+ while ((ch = getopt(argc, argv, "a:b:i:lN")) != -1) {
switch(ch) {
case 'a':
if (gpt == NULL || gpt_attr_get(gpt, ) == -1)
return usage();
break;
+ case 'b':
+ if (gpt == NULL || gpt_human_get(gpt, ) == -1)
+return usage();
+ break;
case 'i':
if (gpt == NULL || gpt_uint_get(gpt, ) == -1)
return usage();
@@ -85,13 +92,28 @@ cmd_set(gpt_t gpt, int argc, char *argv[
case 'l':
gpt_attr_help("\t");
return 0;
+ case 'N':
+ clear = ~clear;
+ break;
default:
return usage();
}
}
- if (gpt == NULL || argc != optind)
+ if (start > 0) {
+ for (m = map_first(gpt); m != NULL; m = m->map_next) {
+ if (m->map_type != MAP_TYPE_GPT_PART ||
+ m->map_index < 1)
+continue;
+ if (start != m->map_start)
+continue;
+ entry = m->map_index;
+ break;
+ }
+ }
+
+ if (gpt == NULL || argc != optind || (attributes != 0 && clear != 0))
return usage();
- return gpt_attr_update(gpt, entry, attributes, 0);
+ return gpt_attr_update(gpt, entry, attributes, clear);
}
CVS commit: src
Module Name:src Committed By: maxv Date: Mon Mar 25 19:24:31 UTC 2019 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: options.4 src/share/man/man7: hier.7 symlink.7 src/share/man/man8: Makefile src/sys/arch/alpha/alpha: compat_16_machdep.c fp_complete.c machdep.c src/sys/arch/alpha/conf: GENERIC files.alpha src/sys/arch/alpha/include: frame.h signal.h src/sys/compat: Makefile Makefile.syscall src/sys/conf: files src/sys/sys: ioctl.h src/usr.bin/kdump: setemul.c Removed Files: src/share/man/man8: compat_osf1.8 src/sys/arch/alpha/alpha: osf1_sigcode.s osf1_syscall.c src/sys/compat/osf1: Makefile README.dynamic README.mach-traps README.syscalls files.osf1 osf1.h osf1_cvt.c osf1_cvt.h osf1_descrip.c osf1_dirent.h osf1_errno.c osf1_errno.h osf1_exec.c osf1_exec.h osf1_exec_ecoff.c osf1_file.c osf1_generic.c osf1_ioctl.c osf1_misc.c osf1_mmap.c osf1_mod.c osf1_mount.c osf1_prot.c osf1_resource.c osf1_signal.c osf1_signal.h osf1_signo.c osf1_socket.c osf1_syscall.h osf1_syscallargs.h osf1_syscalls.c osf1_sysent.c osf1_sysv_ipc.c osf1_time.c syscalls.conf syscalls.master Log Message: Remove compat_osf1, discussed on tech-kern@. To generate a diff of this commit: cvs rdiff -u -r1.1640 -r1.1641 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.497 -r1.498 src/share/man/man4/options.4 cvs rdiff -u -r1.135 -r1.136 src/share/man/man7/hier.7 cvs rdiff -u -r1.28 -r1.29 src/share/man/man7/symlink.7 cvs rdiff -u -r1.107 -r1.108 src/share/man/man8/Makefile cvs rdiff -u -r1.12 -r0 src/share/man/man8/compat_osf1.8 cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/alpha/compat_16_machdep.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/alpha/fp_complete.c cvs rdiff -u -r1.352 -r1.353 src/sys/arch/alpha/alpha/machdep.c cvs rdiff -u -r1.3 -r0 src/sys/arch/alpha/alpha/osf1_sigcode.s cvs rdiff -u -r1.35 -r0 src/sys/arch/alpha/alpha/osf1_syscall.c cvs rdiff -u -r1.390 -r1.391 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.189 -r1.190 src/sys/arch/alpha/conf/files.alpha cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/frame.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/include/signal.h cvs rdiff -u -r1.6 -r1.7 src/sys/compat/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/compat/Makefile.syscall cvs rdiff -u -r1.7 -r0 src/sys/compat/osf1/Makefile \ src/sys/compat/osf1/osf1_errno.c src/sys/compat/osf1/osf1_sysv_ipc.c cvs rdiff -u -r1.3 -r0 src/sys/compat/osf1/README.dynamic \ src/sys/compat/osf1/README.mach-traps src/sys/compat/osf1/README.syscalls \ src/sys/compat/osf1/osf1_errno.h cvs rdiff -u -r1.22 -r0 src/sys/compat/osf1/files.osf1 cvs rdiff -u -r1.27 -r0 src/sys/compat/osf1/osf1.h cvs rdiff -u -r1.28 -r0 src/sys/compat/osf1/osf1_cvt.c cvs rdiff -u -r1.11 -r0 src/sys/compat/osf1/osf1_cvt.h cvs rdiff -u -r1.29 -r0 src/sys/compat/osf1/osf1_descrip.c cvs rdiff -u -r1.1 -r0 src/sys/compat/osf1/osf1_dirent.h cvs rdiff -u -r1.47 -r0 src/sys/compat/osf1/osf1_exec.c cvs rdiff -u -r1.13 -r0 src/sys/compat/osf1/osf1_exec.h \ src/sys/compat/osf1/osf1_prot.c cvs rdiff -u -r1.24 -r0 src/sys/compat/osf1/osf1_exec_ecoff.c cvs rdiff -u -r1.45 -r0 src/sys/compat/osf1/osf1_file.c cvs rdiff -u -r1.17 -r0 src/sys/compat/osf1/osf1_generic.c cvs rdiff -u -r1.23 -r0 src/sys/compat/osf1/osf1_ioctl.c \ src/sys/compat/osf1/osf1_socket.c cvs rdiff -u -r1.88 -r0 src/sys/compat/osf1/osf1_misc.c cvs rdiff -u -r1.14 -r0 src/sys/compat/osf1/osf1_mmap.c cvs rdiff -u -r1.6 -r0 src/sys/compat/osf1/osf1_mod.c \ src/sys/compat/osf1/osf1_signal.h cvs rdiff -u -r1.55 -r0 src/sys/compat/osf1/osf1_mount.c cvs rdiff -u -r1.15 -r0 src/sys/compat/osf1/osf1_resource.c cvs rdiff -u -r1.36 -r0 src/sys/compat/osf1/osf1_signal.c cvs rdiff -u -r1.2 -r0 src/sys/compat/osf1/osf1_signo.c \ src/sys/compat/osf1/syscalls.conf cvs rdiff -u -r1.67 -r0 src/sys/compat/osf1/osf1_syscall.h cvs rdiff -u -r1.68 -r0 src/sys/compat/osf1/osf1_syscallargs.h \ src/sys/compat/osf1/osf1_sysent.c cvs rdiff -u -r1.66 -r0 src/sys/compat/osf1/osf1_syscalls.c cvs rdiff -u -r1.16 -r0 src/sys/compat/osf1/osf1_time.c cvs rdiff -u -r1.49 -r0 src/sys/compat/osf1/syscalls.master cvs rdiff -u -r1.1231 -r1.1232 src/sys/conf/files cvs rdiff -u -r1.38 -r1.39 src/sys/sys/ioctl.h cvs rdiff -u -r1.31 -r1.32 src/usr.bin/kdump/setemul.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1640 src/distrib/sets/lists/man/mi:1.1641 --- src/distrib/sets/lists/man/mi:1.1640 Sun Mar 17 00:35:09 2019 +++ src/distrib/sets/lists/man/mi Mon Mar 25 19:24:29 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1640 2019/03/17 00:35:09 tnn Exp $ +# $NetBSD: mi,v 1.1641 2019/03/25 19:24:29 maxv Exp $ # # Note: don't
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Mar 25 11:43:50 UTC 2019 Modified Files: src/sys/dev/mii: miidevs Log Message: Add Bankspeed Pty and NetExcell. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.150 src/sys/dev/mii/miidevs:1.151 --- src/sys/dev/mii/miidevs:1.150 Mon Mar 25 09:46:50 2019 +++ src/sys/dev/mii/miidevs Mon Mar 25 11:43:50 2019 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.150 2019/03/25 09:46:50 msaitoh Exp $ +$NetBSD: miidevs,v 1.151 2019/03/25 11:43:50 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -55,6 +55,8 @@ oui TRIDIUM 0x0001f0 Tridium oui DATATRACK 0x0002c6 Data Track Technology oui CICADA 0x0003f1 Cicada Semiconductor oui AGERE 0x00053d Agere +oui BANKSPEED 0x0006b8 Bankspeed Pty +oui NETEXCELL 0x0008bb NetExcell oui NETAS 0x0009c3 Netas oui BROADCOM2 0x000af7 Broadcom Corporation oui RALINK 0x000c43 Ralink Technology
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Mar 25 11:44:10 UTC 2019 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.136 -r1.137 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.148 src/sys/dev/mii/miidevs.h:1.149 --- src/sys/dev/mii/miidevs.h:1.148 Mon Mar 25 09:47:17 2019 +++ src/sys/dev/mii/miidevs.h Mon Mar 25 11:44:10 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.148 2019/03/25 09:47:17 msaitoh Exp $ */ +/* $NetBSD: miidevs.h,v 1.149 2019/03/25 11:44:10 msaitoh Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.150 2019/03/25 09:46:50 msaitoh Exp + * NetBSD: miidevs,v 1.151 2019/03/25 11:43:50 msaitoh Exp */ /*- @@ -62,6 +62,8 @@ #define MII_OUI_DATATRACK 0x0002c6 /* Data Track Technology */ #define MII_OUI_CICADA 0x0003f1 /* Cicada Semiconductor */ #define MII_OUI_AGERE 0x00053d /* Agere */ +#define MII_OUI_BANKSPEED 0x0006b8 /* Bankspeed Pty */ +#define MII_OUI_NETEXCELL 0x0008bb /* NetExcell */ #define MII_OUI_NETAS 0x0009c3 /* Netas */ #define MII_OUI_BROADCOM2 0x000af7 /* Broadcom Corporation */ #define MII_OUI_RALINK 0x000c43 /* Ralink Technology */ Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.136 src/sys/dev/mii/miidevs_data.h:1.137 --- src/sys/dev/mii/miidevs_data.h:1.136 Mon Mar 25 09:47:17 2019 +++ src/sys/dev/mii/miidevs_data.h Mon Mar 25 11:44:10 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs_data.h,v 1.136 2019/03/25 09:47:17 msaitoh Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.137 2019/03/25 11:44:10 msaitoh Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.150 2019/03/25 09:46:50 msaitoh Exp + * NetBSD: miidevs,v 1.151 2019/03/25 11:43:50 msaitoh Exp */ /*-
CVS commit: src/sys/net
Module Name:src
Committed By: pgoyette
Date: Mon Mar 25 10:04:48 UTC 2019
Modified Files:
src/sys/net: if_tun.c
Log Message:
in tundetach(), error is only used #ifdef _MODULE so wrap its declaration.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/net/if_tun.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.154 src/sys/net/if_tun.c:1.155
--- src/sys/net/if_tun.c:1.154 Mon Mar 25 09:07:24 2019
+++ src/sys/net/if_tun.c Mon Mar 25 10:04:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.154 2019/03/25 09:07:24 pgoyette Exp $ */
+/* $NetBSD: if_tun.c,v 1.155 2019/03/25 10:04:48 pgoyette Exp $ */
/*
* Copyright (c) 1988, Julian Onions
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.154 2019/03/25 09:07:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.155 2019/03/25 10:04:48 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -142,7 +142,9 @@ tuninit(void)
static int
tundetach(void)
{
- int error = 0;
+#ifdef _MODULE
+ int error;
+#endif
if_clone_detach(_cloner);
#ifdef _MODULE
CVS commit: src/sys/net
Module Name:src
Committed By: pgoyette
Date: Mon Mar 25 09:59:59 UTC 2019
Modified Files:
src/sys/net: if_tap.c
Log Message:
Put the #ifdef where it belongs (after defining the out2 label which is
referenced only inside #ifdef block)
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/net/if_tap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.108 src/sys/net/if_tap.c:1.109
--- src/sys/net/if_tap.c:1.108 Mon Mar 25 09:32:25 2019
+++ src/sys/net/if_tap.c Mon Mar 25 09:59:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.108 2019/03/25 09:32:25 pgoyette Exp $ */
+/* $NetBSD: if_tap.c,v 1.109 2019/03/25 09:59:59 pgoyette Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.108 2019/03/25 09:32:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.109 2019/03/25 09:59:59 pgoyette Exp $");
#if defined(_KERNEL_OPT)
@@ -296,8 +296,8 @@ tapdetach(void)
out1:
#ifdef _MODULE
devsw_attach("tap", NULL, _bmajor, _cdevsw, _cmajor);
-#endif
out2:
+#endif
if_clone_attach(_cloners);
return error;
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Mon Mar 25 09:47:18 UTC 2019
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.147 src/sys/dev/mii/miidevs.h:1.148
--- src/sys/dev/mii/miidevs.h:1.147 Fri Mar 15 04:00:29 2019
+++ src/sys/dev/mii/miidevs.h Mon Mar 25 09:47:17 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.147 2019/03/15 04:00:29 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.148 2019/03/25 09:47:17 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.149 2019/03/15 04:00:06 msaitoh Exp
+ * NetBSD: miidevs,v 1.150 2019/03/25 09:46:50 msaitoh Exp
*/
/*-
@@ -290,7 +290,7 @@
#define MII_STR_BROADCOM4_BCM5725C "BCM5725C 1000BASE-T media interface"
#define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004
#define MII_STR_xxBROADCOM_ALT1_BCM5906 "BCM5906 10/100baseTX media interface"
-
+
/* Cicada Semiconductor PHYs (now owned by Vitesse?) */
#define MII_MODEL_CICADA_CS8201 0x0001
#define MII_STR_CICADA_CS8201 "Cicada CS8201 10/100/1000TX PHY"
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.135 src/sys/dev/mii/miidevs_data.h:1.136
--- src/sys/dev/mii/miidevs_data.h:1.135 Fri Mar 15 04:00:29 2019
+++ src/sys/dev/mii/miidevs_data.h Mon Mar 25 09:47:17 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.135 2019/03/15 04:00:29 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.136 2019/03/25 09:47:17 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.149 2019/03/15 04:00:06 msaitoh Exp
+ * NetBSD: miidevs,v 1.150 2019/03/25 09:46:50 msaitoh Exp
*/
/*-
@@ -36,6 +36,11 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+struct mii_knowndev {
+ int oui;
+ int model;
+ const char *descr;
+};
struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_AGERE, MII_MODEL_AGERE_ET1011, MII_STR_AGERE_ET1011 },
{ MII_OUI_xxASIX, MII_MODEL_xxASIX_AX88X9X, MII_STR_xxASIX_AX88X9X },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Mar 25 09:46:50 UTC 2019 Modified Files: src/sys/dev/mii: miidevs Log Message: Remove extra space. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.149 src/sys/dev/mii/miidevs:1.150 --- src/sys/dev/mii/miidevs:1.149 Fri Mar 15 04:00:06 2019 +++ src/sys/dev/mii/miidevs Mon Mar 25 09:46:50 2019 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.149 2019/03/15 04:00:06 msaitoh Exp $ +$NetBSD: miidevs,v 1.150 2019/03/25 09:46:50 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -209,7 +209,7 @@ model BROADCOM3 BCM57765 0x0024 BCM57765 model BROADCOM3 BCM5720C 0x0036 BCM5720C 1000BASE-T media interface model BROADCOM4 BCM5725C 0x0038 BCM5725C 1000BASE-T media interface model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface - + /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY model CICADA CS8204 0x0004 Cicada CS8204 10/100/1000TX PHY
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Mon Mar 25 09:46:24 UTC 2019
Modified Files:
src/sys/dev/mii: devlist2h.awk mii_verbose.c
Log Message:
Fix compile error when MIIVERBOSE is set. Reported by Kurt Schreiner.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/mii/devlist2h.awk
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/mii/mii_verbose.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/mii/devlist2h.awk
diff -u src/sys/dev/mii/devlist2h.awk:1.8 src/sys/dev/mii/devlist2h.awk:1.9
--- src/sys/dev/mii/devlist2h.awk:1.8 Sat Jun 3 14:46:29 2017
+++ src/sys/dev/mii/devlist2h.awk Mon Mar 25 09:46:24 2019
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.8 2017/06/03 14:46:29 christos Exp $
+# $NetBSD: devlist2h.awk,v 1.9 2019/03/25 09:46:24 msaitoh Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -142,6 +142,11 @@ NF > 0 && $1 == "model" {
models[nmodels, 4]) > hfile
if (!firstdone) {
+ printf("struct mii_knowndev {\n") > dfile
+ printf(" int oui;\n") > dfile
+ printf(" int model;\n") > dfile
+ printf(" const char *descr;\n") > dfile
+ printf("};\n") > dfile
printf("struct mii_knowndev mii_knowndevs[] = {\n") > dfile
firstdone = 1
}
Index: src/sys/dev/mii/mii_verbose.c
diff -u src/sys/dev/mii/mii_verbose.c:1.5 src/sys/dev/mii/mii_verbose.c:1.6
--- src/sys/dev/mii/mii_verbose.c:1.5 Mon Mar 25 07:34:13 2019
+++ src/sys/dev/mii/mii_verbose.c Mon Mar 25 09:46:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_verbose.c,v 1.5 2019/03/25 07:34:13 msaitoh Exp $ */
+/* $NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -55,19 +55,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.5 2019/03/25 07:34:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $");
#include
#include
#include
#include
-struct mii_knowndev {
- int oui;
- int model;
- const char *descr;
-};
-
const char * mii_get_descr_real(int, int);
MODULE(MODULE_CLASS_MISC, miiverbose, NULL);
CVS commit: src/sys/net
Module Name:src
Committed By: pgoyette
Date: Mon Mar 25 09:32:25 UTC 2019
Modified Files:
src/sys/net: if_tap.c
Log Message:
Resequence the activities in tapdetach() so that no new units can be
created, either by opening /dev/tap or ifconfig tapx create, before
checking to see if we have any active units.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/net/if_tap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.107 src/sys/net/if_tap.c:1.108
--- src/sys/net/if_tap.c:1.107 Mon Sep 3 16:29:35 2018
+++ src/sys/net/if_tap.c Mon Mar 25 09:32:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.107 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: if_tap.c,v 1.108 2019/03/25 09:32:25 pgoyette Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.107 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.108 2019/03/25 09:32:25 pgoyette Exp $");
#if defined(_KERNEL_OPT)
@@ -273,20 +273,32 @@ tapdetach(void)
{
int error = 0;
- if (tap_count != 0)
- return EBUSY;
-
+ if_clone_detach(_cloners);
#ifdef _MODULE
- if (error == 0)
- error = devsw_detach(NULL, _cdevsw);
+ error = devsw_detach(NULL, _cdevsw);
+ if (error != 0)
+ goto out2;
#endif
- if (error == 0)
- sysctl_teardown(_sysctl_clog);
- if (error == 0)
- if_clone_detach(_cloners);
- if (error == 0)
- error = config_cfattach_detach(tap_cd.cd_name, _ca);
+ if (tap_count != 0) {
+ error = EBUSY;
+ goto out1;
+ }
+
+ error = config_cfattach_detach(tap_cd.cd_name, _ca);
+ if (error != 0)
+ goto out1;
+
+ sysctl_teardown(_sysctl_clog);
+
+ return 0;
+
+ out1:
+#ifdef _MODULE
+ devsw_attach("tap", NULL, _bmajor, _cdevsw, _cmajor);
+#endif
+ out2:
+ if_clone_attach(_cloners);
return error;
}
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Mon Mar 25 09:29:09 UTC 2019
Modified Files:
src/sys/dev/mii: etphy.c inphy.c lxtphy.c nsphyter.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mii/etphy.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/mii/inphy.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/mii/lxtphy.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/mii/nsphyter.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/mii/etphy.c
diff -u src/sys/dev/mii/etphy.c:1.3 src/sys/dev/mii/etphy.c:1.4
--- src/sys/dev/mii/etphy.c:1.3 Sun Feb 24 17:22:21 2019
+++ src/sys/dev/mii/etphy.c Mon Mar 25 09:29:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: etphy.c,v 1.3 2019/02/24 17:22:21 christos Exp $ */
+/* $NetBSD: etphy.c,v 1.4 2019/03/25 09:29:08 msaitoh Exp $ */
/* $OpenBSD: etphy.c,v 1.4 2008/04/02 20:12:58 brad Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: etphy.c,v 1.3 2019/02/24 17:22:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: etphy.c,v 1.4 2019/03/25 09:29:08 msaitoh Exp $");
#include
#include
@@ -193,9 +193,7 @@ etphy_service(struct mii_softc *sc, stru
switch (cmd) {
case MII_POLLSTAT:
- /*
- * If we're not polling our PHY instance, just return.
- */
+ /* If we're not polling our PHY instance, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
return 0;
break;
@@ -211,9 +209,7 @@ etphy_service(struct mii_softc *sc, stru
return 0;
}
- /*
- * If the interface is not up, don't do anything.
- */
+ /* If the interface is not up, don't do anything. */
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
break;
@@ -239,9 +235,7 @@ etphy_service(struct mii_softc *sc, stru
break;
case MII_TICK:
- /*
- * If we're not currently selected, just return.
- */
+ /* If we're not currently selected, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
return 0;
Index: src/sys/dev/mii/inphy.c
diff -u src/sys/dev/mii/inphy.c:1.57 src/sys/dev/mii/inphy.c:1.58
--- src/sys/dev/mii/inphy.c:1.57 Sun Feb 24 17:22:21 2019
+++ src/sys/dev/mii/inphy.c Mon Mar 25 09:29:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: inphy.c,v 1.57 2019/02/24 17:22:21 christos Exp $ */
+/* $NetBSD: inphy.c,v 1.58 2019/03/25 09:29:08 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.57 2019/02/24 17:22:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.58 2019/03/25 09:29:08 msaitoh Exp $");
#include
#include
@@ -106,9 +106,9 @@ inphymatch(device_t parent, cfdata_t mat
struct mii_attach_args *ma = aux;
if (mii_phy_match(ma, inphys) != NULL)
- return (10);
+ return 10;
- return (0);
+ return 0;
}
static void
@@ -154,11 +154,9 @@ inphy_service(struct mii_softc *sc, stru
switch (cmd) {
case MII_POLLSTAT:
- /*
- * If we're not polling our PHY instance, just return.
- */
+ /* If we're not polling our PHY instance, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
break;
case MII_MEDIACHG:
@@ -169,12 +167,10 @@ inphy_service(struct mii_softc *sc, stru
if (IFM_INST(ife->ifm_media) != sc->mii_inst) {
PHY_READ(sc, MII_BMCR, );
PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO);
- return (0);
+ return 0;
}
- /*
- * If the interface is not up, don't do anything.
- */
+ /* If the interface is not up, don't do anything. */
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
break;
@@ -182,19 +178,17 @@ inphy_service(struct mii_softc *sc, stru
break;
case MII_TICK:
- /*
- * If we're not currently selected, just return.
- */
+ /* If we're not currently selected, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
if (mii_phy_tick(sc) == EJUSTRETURN)
- return (0);
+ return 0;
break;
case MII_DOWN:
mii_phy_down(sc);
- return (0);
+ return 0;
}
/* Update the media status. */
@@ -202,7 +196,7 @@ inphy_service(struct mii_softc *sc, stru
/* Callback if something changed. */
mii_phy_update(sc, cmd);
- return (0);
+ return 0;
}
static void
Index: src/sys/dev/mii/lxtphy.c
diff -u src/sys/dev/mii/lxtphy.c:1.52 src/sys/dev/mii/lxtphy.c:1.53
--- src/sys/dev/mii/lxtphy.c:1.52 Sun Feb 24 17:22:21 2019
+++ src/sys/dev/mii/lxtphy.c Mon Mar 25 09:29:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lxtphy.c,v 1.52 2019/02/24 17:22:21 christos Exp $ */
+/* $NetBSD: lxtphy.c,v 1.53 2019/03/25 09:29:08 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.52 2019/02/24 17:22:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.53 2019/03/25 09:29:08 msaitoh Exp $");
#include
#include
@@
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Mon Mar 25 09:20:46 UTC 2019
Modified Files:
src/sys/dev/mii: acphy.c atphy.c bmtphy.c brgphy.c ciphy.c dmphy.c
gentbi.c icsphy.c iophy.c mii.c mii_physubr.c nsphy.c pnaphy.c
qsphy.c rdcphy.c rgephy.c rlphy.c sqphy.c tlphy.c tqphy.c ukphy.c
ukphy_subr.c urlphy.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/acphy.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/mii/bmtphy.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/mii/dmphy.c src/sys/dev/mii/tqphy.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/gentbi.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/mii/icsphy.c src/sys/dev/mii/sqphy.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/mii/iophy.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/mii/mii.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/mii/nsphy.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/mii/pnaphy.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/mii/qsphy.c src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mii/rdcphy.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/mii/rlphy.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/mii/tlphy.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/mii/ukphy.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/mii/ukphy_subr.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/mii/urlphy.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/mii/acphy.c
diff -u src/sys/dev/mii/acphy.c:1.27 src/sys/dev/mii/acphy.c:1.28
--- src/sys/dev/mii/acphy.c:1.27 Sun Feb 24 17:22:21 2019
+++ src/sys/dev/mii/acphy.c Mon Mar 25 09:20:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acphy.c,v 1.27 2019/02/24 17:22:21 christos Exp $ */
+/* $NetBSD: acphy.c,v 1.28 2019/03/25 09:20:46 msaitoh Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.27 2019/02/24 17:22:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.28 2019/03/25 09:20:46 msaitoh Exp $");
#include
#include
@@ -87,9 +87,9 @@ acphymatch(device_t parent, cfdata_t mat
struct mii_attach_args *ma = aux;
if (mii_phy_match(ma, acphys) != NULL)
- return (10);
+ return 10;
- return (0);
+ return 0;
}
static void
@@ -114,9 +114,7 @@ acphyattach(device_t parent, device_t se
PHY_RESET(sc);
- /*
- * XXX Check MCR_FX_SEL to set MIIF_HAVE_FIBER?
- */
+ /* XXX Check MCR_FX_SEL to set MIIF_HAVE_FIBER? */
PHY_READ(sc, MII_BMSR, >mii_capabilities);
sc->mii_capabilities &= ma->mii_capmask;
@@ -148,11 +146,9 @@ acphy_service(struct mii_softc *sc, stru
switch (cmd) {
case MII_POLLSTAT:
- /*
- * If we're not polling our PHY instance, just return.
- */
+ /* If we're not polling our PHY instance, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
break;
case MII_MEDIACHG:
@@ -163,12 +159,10 @@ acphy_service(struct mii_softc *sc, stru
if (IFM_INST(ife->ifm_media) != sc->mii_inst) {
PHY_READ(sc, MII_BMCR, );
PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO);
- return (0);
+ return 0;
}
- /*
- * If the interface is not up, don't do anything.
- */
+ /* If the interface is not up, don't do anything. */
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
break;
@@ -176,19 +170,17 @@ acphy_service(struct mii_softc *sc, stru
break;
case MII_TICK:
- /*
- * If we're not currently selected, just return.
- */
+ /* If we're not currently selected, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
if (mii_phy_tick(sc) == EJUSTRETURN)
- return (0);
+ return 0;
break;
case MII_DOWN:
mii_phy_down(sc);
- return (0);
+ return 0;
}
/* Update the media status. */
@@ -196,7 +188,7 @@ acphy_service(struct mii_softc *sc, stru
/* Callback if something changed. */
mii_phy_update(sc, cmd);
- return (0);
+ return 0;
}
static void
Index: src/sys/dev/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.20 src/sys/dev/mii/atphy.c:1.21
--- src/sys/dev/mii/atphy.c:1.20 Sun Feb 24 17:22:21 2019
+++ src/sys/dev/mii/atphy.c Mon Mar 25 09:20:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.20 2019/02/24 17:22:21 christos Exp $ */
+/* $NetBSD: atphy.c,v 1.21 2019/03/25 09:20:46 msaitoh Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.20 2019/02/24 17:22:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.21 2019/03/25 09:20:46 msaitoh Exp $");
#include
#include
@@ -174,9 +174,7 @@ atphy_service(struct mii_softc *sc, stru
switch (cmd) {
case MII_POLLSTAT:
- /*
- * If we're not polling
CVS commit: src/sys/net
Module Name:src
Committed By: pgoyette
Date: Mon Mar 25 09:07:24 UTC 2019
Modified Files:
src/sys/net: if_tun.c
Log Message:
Resequence the stuff in tundetach() to ensure that no new device units
can be created by either 'ifconfig create' or 'open("/dev/tun0")' paths.
Note: previous efforts at fixing 'modunload if_tun' are abandoned, since
there is no bug. Just need to ensure that the cloned interface is both
close(1)d _and_ 'ifconfig tunx destroy' before trying to unload.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/net/if_tun.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.153 src/sys/net/if_tun.c:1.154
--- src/sys/net/if_tun.c:1.153 Mon Mar 25 04:06:36 2019
+++ src/sys/net/if_tun.c Mon Mar 25 09:07:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.153 2019/03/25 04:06:36 msaitoh Exp $ */
+/* $NetBSD: if_tun.c,v 1.154 2019/03/25 09:07:24 pgoyette Exp $ */
/*
* Copyright (c) 1988, Julian Onions
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.153 2019/03/25 04:06:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.154 2019/03/25 09:07:24 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -144,19 +144,26 @@ tundetach(void)
{
int error = 0;
- if (!LIST_EMPTY(_softc_list) || !LIST_EMPTY(_softc_list))
- error = EBUSY;
+ if_clone_detach(_cloner);
+#ifdef _MODULE
+ error = devsw_detach(NULL, _cdevsw);
+ if (error != 0) {
+ if_clone_attach(_cloner);
+ return error;
+ }
+#endif
+ if (!LIST_EMPTY(_softc_list) || !LIST_EMPTY(_softc_list)) {
#ifdef _MODULE
- if (error == 0)
- error = devsw_detach(NULL, _cdevsw);
+ devsw_attach("tun", NULL, _bmajor, _cdevsw, _cmajor);
#endif
- if (error == 0) {
- if_clone_detach(_cloner);
- mutex_destroy(_softc_lock);
- }
+ if_clone_attach(_cloner);
+ return EBUSY;
+}
- return error;
+ mutex_destroy(_softc_lock);
+
+ return 0;
}
/*
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Mon Mar 25 07:34:13 UTC 2019
Modified Files:
src/sys/dev/mii: amhphy.c dmphy.c exphy.c glxtphy.c gphyter.c igphy.c
ihphy.c ikphy.c makphy.c micphy.c mii_physubr.c mii_verbose.c
mvphy.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/mii/amhphy.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mii/dmphy.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/mii/exphy.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/glxtphy.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/mii/gphyter.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/igphy.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/mii/ikphy.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/micphy.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/mii_verbose.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/mii/mvphy.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/mii/amhphy.c
diff -u src/sys/dev/mii/amhphy.c:1.22 src/sys/dev/mii/amhphy.c:1.23
--- src/sys/dev/mii/amhphy.c:1.22 Sun Feb 24 17:22:21 2019
+++ src/sys/dev/mii/amhphy.c Mon Mar 25 07:34:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: amhphy.c,v 1.22 2019/02/24 17:22:21 christos Exp $ */
+/* $NetBSD: amhphy.c,v 1.23 2019/03/25 07:34:13 msaitoh Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.22 2019/02/24 17:22:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.23 2019/03/25 07:34:13 msaitoh Exp $");
#include
#include
@@ -82,9 +82,9 @@ amhphymatch(device_t parent, cfdata_t ma
struct mii_attach_args *ma = aux;
if (mii_phy_match(ma, amhphys) != NULL)
- return (10);
+ return 10;
- return (0);
+ return 0;
}
static void
@@ -127,11 +127,9 @@ amhphy_service(struct mii_softc *sc, str
switch (cmd) {
case MII_POLLSTAT:
- /*
- * If we're not polling our PHY instance, just return.
- */
+ /* If we're not polling our PHY instance, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
break;
case MII_MEDIACHG:
@@ -142,12 +140,10 @@ amhphy_service(struct mii_softc *sc, str
if (IFM_INST(ife->ifm_media) != sc->mii_inst) {
PHY_READ(sc, MII_BMCR, );
PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO);
- return (0);
+ return 0;
}
- /*
- * If the interface is not up, don't do anything.
- */
+ /* If the interface is not up, don't do anything. */
if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
break;
@@ -155,19 +151,17 @@ amhphy_service(struct mii_softc *sc, str
break;
case MII_TICK:
- /*
- * If we're not currently selected, just return.
- */
+ /* If we're not currently selected, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
if (mii_phy_tick(sc) == EJUSTRETURN)
- return (0);
+ return 0;
break;
case MII_DOWN:
mii_phy_down(sc);
- return (0);
+ return 0;
}
/* Update the media status. */
@@ -175,7 +169,7 @@ amhphy_service(struct mii_softc *sc, str
/* Callback if something changed. */
mii_phy_update(sc, cmd);
- return (0);
+ return 0;
}
static void
@@ -218,9 +212,8 @@ amhphy_status(struct mii_softc *sc)
if (ssr & SSR_S) {
/*
* This should't really ever happen, since it's
- * a 10BASE-T only PHY. But the bit exists,
- * according to the documentation, so we pay
- * attention to it.
+ * a 10BASE-T only PHY. But the bit exists, according
+ * to the documentation, so we pay attention to it.
*/
mii->mii_media_active |= IFM_100_TX;
} else
Index: src/sys/dev/mii/dmphy.c
diff -u src/sys/dev/mii/dmphy.c:1.41 src/sys/dev/mii/dmphy.c:1.42
--- src/sys/dev/mii/dmphy.c:1.41 Mon Mar 18 02:52:23 2019
+++ src/sys/dev/mii/dmphy.c Mon Mar 25 07:34:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dmphy.c,v 1.41 2019/03/18 02:52:23 msaitoh Exp $ */
+/* $NetBSD: dmphy.c,v 1.42 2019/03/25 07:34:13 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.41 2019/03/18 02:52:23 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.42 2019/03/25 07:34:13 msaitoh Exp $");
#include
#include
@@ -108,9 +108,9 @@ dmphymatch(device_t parent, cfdata_t mat
struct mii_attach_args *ma = aux;
if (mii_phy_match(ma, dmphys) != NULL)
- return (10);
+ return 10;
- return (0);
+ return 0;
}
static void
@@ -153,11 +153,9 @@ dmphy_service(struct mii_softc *sc, stru
switch (cmd) {
case MII_POLLSTAT:
- /*
- * If we're not polling our PHY instance, just return.
- */
+ /* If we're not polling our PHY instance, just return. */
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Mar 25 07:09:54 UTC 2019 Modified Files: src/sys/dev/mii: mii_ethersubr.c Log Message: - Copy copyright messages from if_ethersubr.c rev. 1.157. - Add missing RCS ID. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/mii_ethersubr.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/mii/mii_ethersubr.c diff -u src/sys/dev/mii/mii_ethersubr.c:1.1 src/sys/dev/mii/mii_ethersubr.c:1.2 --- src/sys/dev/mii/mii_ethersubr.c:1.1 Wed Jan 2 00:41:07 2008 +++ src/sys/dev/mii/mii_ethersubr.c Mon Mar 25 07:09:54 2019 @@ -1,3 +1,68 @@ +/* $NetBSD: mii_ethersubr.c,v 1.2 2019/03/25 07:09:54 msaitoh Exp $ */ + +/* + * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + *may be used to endorse or promote products derived from this software + *without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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. + */ + +/* + * Copyright (c) 1982, 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + *may be used to endorse or promote products derived from this software + *without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + * + * @(#)if_ethersubr.c 8.2 (Berkeley) 4/4/96 + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: mii_ethersubr.c,v 1.2 2019/03/25 07:09:54 msaitoh Exp $"); + #include #include #include
CVS commit: src/sbin/dump_lfs
Module Name:src Committed By: wiz Date: Mon Mar 25 07:03:58 UTC 2019 Modified Files: src/sbin/dump_lfs: dump_lfs.8 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sbin/dump_lfs/dump_lfs.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/dump_lfs/dump_lfs.8 diff -u src/sbin/dump_lfs/dump_lfs.8:1.18 src/sbin/dump_lfs/dump_lfs.8:1.19 --- src/sbin/dump_lfs/dump_lfs.8:1.18 Mon Mar 25 02:13:01 2019 +++ src/sbin/dump_lfs/dump_lfs.8 Mon Mar 25 07:03:58 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: dump_lfs.8,v 1.18 2019/03/25 02:13:01 manu Exp $ +.\" $NetBSD: dump_lfs.8,v 1.19 2019/03/25 07:03:58 wiz Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" Regents of the University of California. @@ -30,7 +30,7 @@ .\" .\" @(#)dump.8 8.3 (Berkeley) 5/1/95 .\" -.Dd July 23, 2006 +.Dd March 25, 2019 .Dt DUMP_LFS 8 .Os .Sh NAME
CVS commit: src/sbin/dump
Module Name:src Committed By: wiz Date: Mon Mar 25 07:03:17 UTC 2019 Modified Files: src/sbin/dump: dump.8 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sbin/dump/dump.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/dump/dump.8 diff -u src/sbin/dump/dump.8:1.70 src/sbin/dump/dump.8:1.71 --- src/sbin/dump/dump.8:1.70 Mon Mar 25 02:13:01 2019 +++ src/sbin/dump/dump.8 Mon Mar 25 07:03:17 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: dump.8,v 1.70 2019/03/25 02:13:01 manu Exp $ +.\" $NetBSD: dump.8,v 1.71 2019/03/25 07:03:17 wiz Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" Regents of the University of California. @@ -30,7 +30,7 @@ .\" .\" @(#)dump.8 8.3 (Berkeley) 5/1/95 .\" -.Dd July 15, 2018 +.Dd March 25, 2019 .Dt DUMP 8 .Os .Sh NAME
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Mar 25 06:17:56 UTC 2019 Modified Files: src/sys/dev/mii: makphyvar.h Log Message: Add my name. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/makphyvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/makphyvar.h diff -u src/sys/dev/mii/makphyvar.h:1.1 src/sys/dev/mii/makphyvar.h:1.2 --- src/sys/dev/mii/makphyvar.h:1.1 Mon Mar 25 05:39:51 2019 +++ src/sys/dev/mii/makphyvar.h Mon Mar 25 06:17:56 2019 @@ -1,11 +1,11 @@ -/* $NetBSD: makphyvar.h,v 1.1 2019/03/25 05:39:51 msaitoh Exp $ */ +/* $NetBSD: makphyvar.h,v 1.2 2019/03/25 06:17:56 msaitoh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Masanobu SAITOH. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions
