Module Name:    src
Committed By:   msaitoh
Date:           Sun Dec  5 02:47:01 UTC 2021

Modified Files:
        src/sys/arch/evbppc/virtex/dev: if_temac.c
        src/sys/arch/i386/stand/cdboot: cdboot.S
        src/sys/dev/ic: mfi.c rt2560.c
        src/sys/dev/marvell: if_mvxpevar.h

Log Message:
s/decriptor/descriptor/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/virtex/dev/if_temac.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/stand/cdboot/cdboot.S
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/rt2560.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/marvell/if_mvxpevar.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/evbppc/virtex/dev/if_temac.c
diff -u src/sys/arch/evbppc/virtex/dev/if_temac.c:1.17 src/sys/arch/evbppc/virtex/dev/if_temac.c:1.18
--- src/sys/arch/evbppc/virtex/dev/if_temac.c:1.17	Mon Mar 29 13:14:13 2021
+++ src/sys/arch/evbppc/virtex/dev/if_temac.c	Sun Dec  5 02:47:01 2021
@@ -1,4 +1,4 @@
-/* 	$NetBSD: if_temac.c,v 1.17 2021/03/29 13:14:13 rin Exp $ */
+/* 	$NetBSD: if_temac.c,v 1.18 2021/12/05 02:47:01 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2006 Jachym Holecek
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.17 2021/03/29 13:14:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_temac.c,v 1.18 2021/12/05 02:47:01 msaitoh Exp $");
 
 
 #include <sys/param.h>
@@ -1165,7 +1165,9 @@ temac_rxreap(struct temac_softc *sc)
 		if ((stat & CDMAC_STAT_DONE) == 0)
 			break;
 
-		/* Count any decriptor we've collected, regardless of status. */
+		/*
+		 * Count any descriptor we've collected, regardless of status.
+		 */
 		nseg ++;
 
 		/* XXXFreza: This won't work for jumbo frames. */

Index: src/sys/arch/i386/stand/cdboot/cdboot.S
diff -u src/sys/arch/i386/stand/cdboot/cdboot.S:1.12 src/sys/arch/i386/stand/cdboot/cdboot.S:1.13
--- src/sys/arch/i386/stand/cdboot/cdboot.S:1.12	Tue Jan  4 16:53:05 2011
+++ src/sys/arch/i386/stand/cdboot/cdboot.S	Sun Dec  5 02:47:01 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdboot.S,v 1.12 2011/01/04 16:53:05 jakllsch Exp $	*/
+/*	$NetBSD: cdboot.S,v 1.13 2021/12/05 02:47:01 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -222,7 +222,7 @@ boot_cdrom:
 	movw	$str_banner, %si
 	call	message
 
-/* Read volume descriptor sectors until Primary decriptor found */
+/* Read volume descriptor sectors until Primary descriptor found */
 	movl	$VD_LBA, %eax
 next_block:
 	movb	$1, %dh			/* Number of sectors to read */

Index: src/sys/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.66 src/sys/dev/ic/mfi.c:1.67
--- src/sys/dev/ic/mfi.c:1.66	Sat Nov  6 06:52:48 2021
+++ src/sys/dev/ic/mfi.c	Sun Dec  5 02:47:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.66 2021/11/06 06:52:48 msaitoh Exp $ */
+/* $NetBSD: mfi.c,v 1.67 2021/12/05 02:47:01 msaitoh Exp $ */
 /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
 
 /*
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.66 2021/11/06 06:52:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.67 2021/12/05 02:47:01 msaitoh Exp $");
 
 #include "bio.h"
 
@@ -2924,7 +2924,7 @@ mfi_tbolt_init_desc_pool(struct mfi_soft
 	uint32_t     offset = 0;
 	uint8_t      *addr = MFIMEM_KVA(sc->sc_tbolt_reqmsgpool);
 
-	/* Request Decriptors alignment restrictions */
+	/* Request Descriptors alignment restrictions */
 	KASSERT(((uintptr_t)addr & 0xFF) == 0);
 
 	/* Skip request message pool */

Index: src/sys/dev/ic/rt2560.c
diff -u src/sys/dev/ic/rt2560.c:1.39 src/sys/dev/ic/rt2560.c:1.40
--- src/sys/dev/ic/rt2560.c:1.39	Wed Jun 16 00:21:18 2021
+++ src/sys/dev/ic/rt2560.c	Sun Dec  5 02:47:01 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rt2560.c,v 1.39 2021/06/16 00:21:18 riastradh Exp $	*/
+/*	$NetBSD: rt2560.c,v 1.40 2021/12/05 02:47:01 msaitoh Exp $	*/
 /*	$OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $  */
 /*	$FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
 
@@ -24,7 +24,7 @@
  * http://www.ralinktech.com/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.39 2021/06/16 00:21:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.40 2021/12/05 02:47:01 msaitoh Exp $");
 
 
 #include <sys/param.h>
@@ -1238,7 +1238,7 @@ rt2560_decryption_intr(struct rt2560_sof
 	struct mbuf *mnew, *m;
 	int hw, error, s;
 
-	/* retrieve last decriptor index processed by cipher engine */
+	/* retrieve last descriptor index processed by cipher engine */
 	hw = (RAL_READ(sc, RT2560_SECCSR0) - sc->rxq.physaddr) /
 	    RT2560_RX_DESC_SIZE;
 

Index: src/sys/dev/marvell/if_mvxpevar.h
diff -u src/sys/dev/marvell/if_mvxpevar.h:1.5 src/sys/dev/marvell/if_mvxpevar.h:1.6
--- src/sys/dev/marvell/if_mvxpevar.h:1.5	Fri Sep 13 07:55:07 2019
+++ src/sys/dev/marvell/if_mvxpevar.h	Sun Dec  5 02:47:01 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvxpevar.h,v 1.5 2019/09/13 07:55:07 msaitoh Exp $	*/
+/*	$NetBSD: if_mvxpevar.h,v 1.6 2021/12/05 02:47:01 msaitoh Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -102,7 +102,7 @@
  * DMA Descriptor
  *
  * the ethernet device has 8 rx/tx DMA queues. each of queue has its own
- * decriptor list. descriptors are simply index by counter inside the device.
+ * descriptor list. descriptors are simply index by counter inside the device.
  */
 #define MVXPE_TX_RING_CNT	IFQ_MAXLEN
 #define MVXPE_TX_RING_MSK	(MVXPE_TX_RING_CNT - 1)

Reply via email to