 @@ -1,14 +1,14 @@
-/*	$NetBSD: octeon_gmx.c,v 1.20 2021/08/07 16:18:59 thorpej Exp $	*/
+/*	$NetBSD: octeon_gmx.c,v 1.21 2022/05/04 07:32:50 andvar Exp $	*/
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.20 2021/08/07 16:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.21 2022/05/04 07:32:50 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/lock.h>
 #include <sys/cdefs.h>
 #include <sys/kmem.h>
 #include <sys/syslog.h>
 #include <mips/locore.h>
 #include <mips/include/cpuregs.h>
 @@ -583,27 +583,27 @@ octgmx_set_filter(struct octgmx_port_sof
 	if (ISSET(ifp->if_flags, IFF_BROADCAST)) {
 		dprintf("accept broadcast\n");
 		SET(ctl, RXN_ADR_CTL_BCST);
+	}
 	if (ISSET(ifp->if_flags, IFF_PROMISC)) {
 		dprintf("promiscas(reject cam)\n");
 		CLR(ctl, RXN_ADR_CTL_CAM_MODE);
 	} else {
 		dprintf("not promiscas(accept cam)\n");
 		SET(ctl, RXN_ADR_CTL_CAM_MODE);
+	}
 	/*
-	 * Note first entry is self MAC address; other 7 entires are available
+	 * Note first entry is self MAC address; other 7 entries are available
 	 * for multicast addresses.
 	 */
 	ETHER_LOCK(ec);
 	ETHER_FIRST_MULTI(step, ec, enm);
 	while (enm != NULL) {
 		int i;
 		dprintf("%d: lo(%02x:%02x:%02x:%02x:%02x:%02x) - "
 		    "hi(%02x:%02x:%02x:%02x:%02x:%02x)\n",
 		    multi + 1,
 		    enm->enm_addrlo[0], enm->enm_addrlo[1],
 		    enm->enm_addrlo[2], enm->enm_addrlo[3],

 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic6915reg.h,v 1.6 2019/08/01 15:21:09 msaitoh Exp $	*/
+/*	$NetBSD: aic6915reg.h,v 1.7 2022/05/04 07:32:50 andvar Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -214,27 +214,27 @@ struct sf_tcd {
 #define	TCD_PauseTx		(1U << 27)
 #define	TCD_TxPaused		(1U << 28)
 /*
  * The Tx indices are in units of 8 bytes, and since we are using
  * Tx descriptors that are 128 bytes long, we need to divide by 16
  * to get the actual index that we care about.
  */
 #define	SF_TXDINDEX_TO_HOST(x)		((x) >> 4)
 #define	SF_TXDINDEX_TO_CHIP(x)		((x) << 4)
 /*
  * To make matters worse, the manual lies about the indices in the
- * completion queue entires.  It claims they are in 8-byte units,
+ * completion queue entries.  It claims they are in 8-byte units,
  * but they're actually *BYTES*, which means we need to divide by
  * 128 to get the actual index.
  */
 #define	SF_TCD_INDEX_TO_HOST(x)		((x) >> 7)
 /*
  * PCI configuration space addresses.
  */
 #define	SF_PCI_MEMBA		(PCI_MAPREG_START + 0x00)
 #define	SF_PCI_IOBA		(PCI_MAPREG_START + 0x08)
 #define	SF_GENREG_OFFSET	0x50000
 #define	SF_FUNCREG_SIZE		0x100

 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic6915var.h,v 1.4 2012/10/27 17:18:19 chs Exp $	*/
+/*	$NetBSD: aic6915var.h,v 1.5 2022/05/04 07:32:50 andvar Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -69,27 +69,27 @@
 /*
  * Control structures are DMA to the Starfire chip.  We allocate them in
  * a single clump that maps to a single DMA segment to make several things
  * easier.
  */
 struct sf_control_data {
 	/*
 	 * The transmit descriptors.
 	 */
 	struct sf_txdesc0 scd_txdescs[SF_NTXDESC];
 	/*
-	 * The transmit completion queue entires.
+	 * The transmit completion queue entries.
 	 */
 	struct sf_tcd scd_txcomp[SF_NTCD];
 	/*
 	 * The receive buffer descriptors.
 	 */
 	struct sf_rbd32 scd_rxbufdescs[SF_NRXDESC];
 	/*
 	 * The receive completion queue entries.
 	 */
 	struct sf_rcd_full scd_rxcomp[SF_NRCD];
 };

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: arp.4,v 1.14 2016/10/16 05:32:30 wiz Exp $
+.\"	$NetBSD: arp.4,v 1.15 2022/05/04 07:32:50 andvar Exp $
 .\"
 .\" Copyright (c) 1985, 1986, 1988, 1994
 .\"	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
 @@ -55,27 +55,27 @@ mapping request;
 only the most recently ``transmitted'' packet is kept.
 If the target host does not respond after several requests,
 the host is considered to be down for a short period (normally 20 seconds),
 allowing an error to be returned to transmission attempts during this
 interval.
 The error is
 .Er EHOSTDOWN
 for a non-responding destination host, and
 .Er EHOSTUNREACH
 for a non-responding router.
 .Pp
 Each ARP cache entry is stored in a network interface which a response
 of ARP comes in.
-ARP cache entires time out periodically (normally 20 minutes after validated;
+ARP cache entries time out periodically (normally 20 minutes after validated;
 entries are not validated when not in use).
 .Pp
 ARP entries may be added, deleted or changed with the
 .Xr arp 8
 utility.
 Manually-added entries may be temporary or permanent,
 and may be
 .Dq published ,
 in which case the system will respond to ARP requests for that host
 as if it were the target of the request.
 .Pp
 In the past,
 ARP was used to negotiate the use of a trailer encapsulation.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bsddisklabel.c,v 1.60 2022/04/16 18:15:23 andvar Exp $	*/
+/*	$NetBSD: bsddisklabel.c,v 1.61 2022/05/04 07:32:50 andvar Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Based on code written by Philip A. Nelson for Piermont Information
  * Systems Inc.
+ *
  * 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.
 @@ -1230,27 +1230,27 @@ sort_and_sync_parts(struct partition_usa
 	for (i = 0; i < pset->num; i++) {
 		if (pset->infos[i].size == 0)
 			continue;
 		if (pset->infos[i].cur_part_id != NO_PART)
 			continue;
 		no++;
+	}
 	/* allocate new infos */
 	infos = calloc(no, sizeof *infos);
 	if (infos == NULL)
 		return;
-	/* pre-initialize the first entires as dummy entries */
+	/* pre-initialize the first entries as dummy entries */
 	for (i = 0; i < pset->parts->num_part; i++) {
 		infos[i].cur_part_id = NO_PART;
 		infos[i].cur_flags = PTI_PSCHEME_INTERNAL;
+	}
 	/*
 	 * Now copy over eveything from our old entries that points to
 	 * a real partition.
 	 */
 	for (i = 0; i < pset->num; i++) {
 		pno = pset->infos[i].cur_part_id;
 		if (pno == NO_PART)
 			continue;
 		if (pset->parts != pset->infos[i].parts)
 @@ -1274,27 +1274,27 @@ sort_and_sync_parts(struct partition_usa
 		if (!pset->parts->pscheme->get_part_info(pset->parts, pno,
 		    &info))
 			continue;
 		infos[pno].parts = pset->parts;
 		infos[pno].cur_part_id = pno;
 		infos[pno].cur_flags = info.flags;
 		infos[pno].size = info.size;
 		infos[pno].type = info.nat_type->generic_ptype;
 		infos[pno].cur_start = info.start;
 		infos[pno].fs_type = info.fs_type;
 		infos[pno].fs_version = info.fs_sub_type;
+	}
-	/* Add the non-partition entires after that */
+	/* Add the non-partition entries after that */
 	j = pset->parts->num_part;
 	for (i = 0; i < pset->num; i++) {
 		if (j >= no)
 			break;
 		if (pset->infos[i].size == 0)
 			continue;
 		if (pset->infos[i].cur_part_id != NO_PART)
 			continue;
 		memcpy(infos+j, pset->infos+i, sizeof(*infos));
 		j++;
+	}
 	/* done, replace infos */