Module Name: src
Committed By: andvar
Date: Sat Feb 10 09:30:06 UTC 2024
Modified Files:
src/sys/arch/mips/adm5120/dev: if_admsw.c
src/sys/arch/mips/atheros/dev: if_ae.c
src/sys/arch/powerpc/ibm4xx/dev: if_emac.c
src/sys/arch/sgimips/hpc: if_sq.c
src/sys/arch/sparc/sparc: pmap.c
src/sys/dev/ic: gem.c smc83c170.c tulip.c
src/sys/dev/pci: if_bce.c if_pcn.c if_sip.c if_ste.c if_stge.c if_txp.c
Log Message:
s/alloted/allotted/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mips/adm5120/dev/if_admsw.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mips/atheros/dev/if_ae.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sgimips/hpc/if_sq.c
cvs rdiff -u -r1.377 -r1.378 src/sys/arch/sparc/sparc/pmap.c
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/ic/gem.c
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/ic/smc83c170.c
cvs rdiff -u -r1.210 -r1.211 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/pci/if_bce.c src/sys/dev/pci/if_ste.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_pcn.c
cvs rdiff -u -r1.190 -r1.191 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pci/if_stge.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/if_txp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/adm5120/dev/if_admsw.c
diff -u src/sys/arch/mips/adm5120/dev/if_admsw.c:1.30 src/sys/arch/mips/adm5120/dev/if_admsw.c:1.31
--- src/sys/arch/mips/adm5120/dev/if_admsw.c:1.30 Thu Sep 29 07:00:46 2022
+++ src/sys/arch/mips/adm5120/dev/if_admsw.c Sat Feb 10 09:30:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.30 2022/09/29 07:00:46 skrll Exp $ */
+/* $NetBSD: if_admsw.c,v 1.31 2024/02/10 09:30:05 andvar Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.30 2022/09/29 07:00:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.31 2024/02/10 09:30:05 andvar Exp $");
#include <sys/param.h>
@@ -583,7 +583,7 @@ admsw_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources. In this case, we'll copy
* and try again.
*/
Index: src/sys/arch/mips/atheros/dev/if_ae.c
diff -u src/sys/arch/mips/atheros/dev/if_ae.c:1.42 src/sys/arch/mips/atheros/dev/if_ae.c:1.43
--- src/sys/arch/mips/atheros/dev/if_ae.c:1.42 Thu Sep 29 07:00:46 2022
+++ src/sys/arch/mips/atheros/dev/if_ae.c Sat Feb 10 09:30:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ae.c,v 1.42 2022/09/29 07:00:46 skrll Exp $ */
+/* $NetBSD: if_ae.c,v 1.43 2024/02/10 09:30:05 andvar Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.42 2022/09/29 07:00:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.43 2024/02/10 09:30:05 andvar Exp $");
#include <sys/param.h>
@@ -587,7 +587,7 @@ ae_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we were
+ * didn't fit in the allotted number of segments, or we were
* short on resources. In this case, we'll copy and try
* again.
*/
Index: src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.58 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.59
--- src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.58 Fri Feb 2 22:33:42 2024
+++ src/sys/arch/powerpc/ibm4xx/dev/if_emac.c Sat Feb 10 09:30:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_emac.c,v 1.58 2024/02/02 22:33:42 andvar Exp $ */
+/* $NetBSD: if_emac.c,v 1.59 2024/02/10 09:30:05 andvar Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.58 2024/02/02 22:33:42 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.59 2024/02/10 09:30:05 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_emac.h"
@@ -707,7 +707,7 @@ emac_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources. In this case, we'll copy
* and try again.
*/
Index: src/sys/arch/sgimips/hpc/if_sq.c
diff -u src/sys/arch/sgimips/hpc/if_sq.c:1.57 src/sys/arch/sgimips/hpc/if_sq.c:1.58
--- src/sys/arch/sgimips/hpc/if_sq.c:1.57 Wed Dec 20 15:29:07 2023
+++ src/sys/arch/sgimips/hpc/if_sq.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sq.c,v 1.57 2023/12/20 15:29:07 thorpej Exp $ */
+/* $NetBSD: if_sq.c,v 1.58 2024/02/10 09:30:06 andvar Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.57 2023/12/20 15:29:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.58 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
@@ -561,7 +561,7 @@ sq_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we were
+ * didn't fit in the allotted number of segments, or we were
* short on resources. In this case, we'll copy and try
* again.
* Also copy it if we need to pad, so that we are sure there
Index: src/sys/arch/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.377 src/sys/arch/sparc/sparc/pmap.c:1.378
--- src/sys/arch/sparc/sparc/pmap.c:1.377 Sat Apr 9 23:38:32 2022
+++ src/sys/arch/sparc/sparc/pmap.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.377 2022/04/09 23:38:32 riastradh Exp $ */
+/* $NetBSD: pmap.c,v 1.378 2024/02/10 09:30:06 andvar Exp $ */
/*
* Copyright (c) 1996
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.377 2022/04/09 23:38:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.378 2024/02/10 09:30:06 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -363,7 +363,7 @@ static bool lock_available = false; /* d
* (sun4/4c)
* A context is simply a small number that dictates which set of 4096
* segment map entries the MMU uses. The Sun 4c has eight (SS1,IPC) or
- * sixteen (SS2,IPX) such sets. These are alloted in an `almost MRU' fashion.
+ * sixteen (SS2,IPX) such sets. These are allotted in an `almost MRU' fashion.
* (sun4m)
* A context is simply a small number that indexes the context table, the
* root-level page table mapping 4G areas. Each entry in this table points
Index: src/sys/dev/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.135 src/sys/dev/ic/gem.c:1.136
--- src/sys/dev/ic/gem.c:1.135 Sun Sep 25 18:43:32 2022
+++ src/sys/dev/ic/gem.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.135 2022/09/25 18:43:32 thorpej Exp $ */
+/* $NetBSD: gem.c,v 1.136 2024/02/10 09:30:06 andvar Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.135 2022/09/25 18:43:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.136 2024/02/10 09:30:06 andvar Exp $");
#include "opt_inet.h"
@@ -1410,7 +1410,7 @@ next:
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we were
+ * didn't fit in the allotted number of segments, or we were
* short on resources. In this case, we'll copy and try
* again.
*/
Index: src/sys/dev/ic/smc83c170.c
diff -u src/sys/dev/ic/smc83c170.c:1.96 src/sys/dev/ic/smc83c170.c:1.97
--- src/sys/dev/ic/smc83c170.c:1.96 Sun Sep 25 18:43:32 2022
+++ src/sys/dev/ic/smc83c170.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170.c,v 1.96 2022/09/25 18:43:32 thorpej Exp $ */
+/* $NetBSD: smc83c170.c,v 1.97 2024/02/10 09:30:06 andvar Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.96 2022/09/25 18:43:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.97 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
@@ -397,7 +397,7 @@ epic_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of frags, or we were
+ * didn't fit in the allotted number of frags, or we were
* short on resources. In this case, we'll copy and try
* again.
*/
Index: src/sys/dev/ic/tulip.c
diff -u src/sys/dev/ic/tulip.c:1.210 src/sys/dev/ic/tulip.c:1.211
--- src/sys/dev/ic/tulip.c:1.210 Wed Dec 20 04:32:30 2023
+++ src/sys/dev/ic/tulip.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.210 2023/12/20 04:32:30 thorpej Exp $ */
+/* $NetBSD: tulip.c,v 1.211 2024/02/10 09:30:06 andvar Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.210 2023/12/20 04:32:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.211 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
@@ -725,7 +725,7 @@ tlp_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we were
+ * didn't fit in the allotted number of segments, or we were
* short on resources. In this case, we'll copy and try
* again.
*
Index: src/sys/dev/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.64 src/sys/dev/pci/if_bce.c:1.65
--- src/sys/dev/pci/if_bce.c:1.64 Fri Feb 9 22:08:35 2024
+++ src/sys/dev/pci/if_bce.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.64 2024/02/09 22:08:35 andvar Exp $ */
+/* $NetBSD: if_bce.c,v 1.65 2024/02/10 09:30:06 andvar Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.64 2024/02/09 22:08:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.65 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -543,7 +543,7 @@ bce_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources. If the packet will not fit,
* it will be dropped. If short on resources, it will
* be tried again later.
Index: src/sys/dev/pci/if_ste.c
diff -u src/sys/dev/pci/if_ste.c:1.64 src/sys/dev/pci/if_ste.c:1.65
--- src/sys/dev/pci/if_ste.c:1.64 Wed Sep 21 20:24:42 2022
+++ src/sys/dev/pci/if_ste.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ste.c,v 1.64 2022/09/21 20:24:42 thorpej Exp $ */
+/* $NetBSD: if_ste.c,v 1.65 2024/02/10 09:30:06 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.64 2022/09/21 20:24:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.65 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
@@ -690,7 +690,7 @@ ste_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources. In this case, we'll copy
* and try again.
*/
Index: src/sys/dev/pci/if_pcn.c
diff -u src/sys/dev/pci/if_pcn.c:1.77 src/sys/dev/pci/if_pcn.c:1.78
--- src/sys/dev/pci/if_pcn.c:1.77 Sat Sep 24 18:12:42 2022
+++ src/sys/dev/pci/if_pcn.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pcn.c,v 1.77 2022/09/24 18:12:42 thorpej Exp $ */
+/* $NetBSD: if_pcn.c,v 1.78 2024/02/10 09:30:06 andvar Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.77 2022/09/24 18:12:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.78 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -944,7 +944,7 @@ pcn_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources. In this case, we'll copy
* and try again.
*/
Index: src/sys/dev/pci/if_sip.c
diff -u src/sys/dev/pci/if_sip.c:1.190 src/sys/dev/pci/if_sip.c:1.191
--- src/sys/dev/pci/if_sip.c:1.190 Fri Jun 2 08:51:47 2023
+++ src/sys/dev/pci/if_sip.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.190 2023/06/02 08:51:47 andvar Exp $ */
+/* $NetBSD: if_sip.c,v 1.191 2024/02/10 09:30:06 andvar Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.190 2023/06/02 08:51:47 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.191 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1574,7 +1574,7 @@ sipcom_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources.
*/
error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0,
Index: src/sys/dev/pci/if_stge.c
diff -u src/sys/dev/pci/if_stge.c:1.90 src/sys/dev/pci/if_stge.c:1.91
--- src/sys/dev/pci/if_stge.c:1.90 Sat Sep 24 18:12:43 2022
+++ src/sys/dev/pci/if_stge.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.90 2022/09/24 18:12:43 thorpej Exp $ */
+/* $NetBSD: if_stge.c,v 1.91 2024/02/10 09:30:06 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.90 2022/09/24 18:12:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.91 2024/02/10 09:30:06 andvar Exp $");
#include <sys/param.h>
@@ -880,7 +880,7 @@ stge_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources. For the too-many-segments
* case, we simply report an error and drop the packet,
* since we can't sanely copy a jumbo packet to a single
Index: src/sys/dev/pci/if_txp.c
diff -u src/sys/dev/pci/if_txp.c:1.74 src/sys/dev/pci/if_txp.c:1.75
--- src/sys/dev/pci/if_txp.c:1.74 Wed Dec 20 05:08:34 2023
+++ src/sys/dev/pci/if_txp.c Sat Feb 10 09:30:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.74 2023/12/20 05:08:34 thorpej Exp $ */
+/* $NetBSD: if_txp.c,v 1.75 2024/02/10 09:30:06 andvar Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.74 2023/12/20 05:08:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.75 2024/02/10 09:30:06 andvar Exp $");
#include "opt_inet.h"
@@ -1473,7 +1473,7 @@ txp_start(struct ifnet *ifp)
/*
* Load the DMA map. If this fails, the packet either
- * didn't fit in the alloted number of segments, or we
+ * didn't fit in the allotted number of segments, or we
* were short on resources. In this case, we'll copy
* and try again.
*/
