Module Name:    src
Committed By:   andvar
Date:           Sat Dec  4 13:23:04 UTC 2021

Modified Files:
        src/sys/arch/pmax/ibus: sii_ds.c
        src/sys/arch/sparc/sparc: timer_sun4m.c
        src/sys/arch/sparc64/dev: vdsk.c
        src/sys/netbt: hci_link.c
        src/sys/netinet: dccp_usrreq.c

Log Message:
fix typos in comments and log messages, mainly in establish(ed).


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/ibus/sii_ds.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/sparc/timer_sun4m.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/vdsk.c
cvs rdiff -u -r1.25 -r1.26 src/sys/netbt/hci_link.c
cvs rdiff -u -r1.21 -r1.22 src/sys/netinet/dccp_usrreq.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/pmax/ibus/sii_ds.c
diff -u src/sys/arch/pmax/ibus/sii_ds.c:1.10 src/sys/arch/pmax/ibus/sii_ds.c:1.11
--- src/sys/arch/pmax/ibus/sii_ds.c:1.10	Tue Jun  9 20:23:53 2015
+++ src/sys/arch/pmax/ibus/sii_ds.c	Sat Dec  4 13:23:03 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sii_ds.c,v 1.10 2015/06/09 20:23:53 matt Exp $	*/
+/*	$NetBSD: sii_ds.c,v 1.11 2021/12/04 13:23:03 andvar Exp $	*/
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.10 2015/06/09 20:23:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.11 2021/12/04 13:23:03 andvar Exp $");
 
 #include "sii.h"
 
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1
 #include <pmax/ibus/siireg.h>
 #include <pmax/ibus/siivar.h>
 
-#include <pmax/ibus/ibusvar.h>		/* interrupt etablish */
+#include <pmax/ibus/ibusvar.h>		/* interrupt establish */
 
 #include <pmax/pmax/kn01.h>		/* kn01 (ds3100) address constants */
 #include <pmax/pmax/pmaxtype.h>

Index: src/sys/arch/sparc/sparc/timer_sun4m.c
diff -u src/sys/arch/sparc/sparc/timer_sun4m.c:1.31 src/sys/arch/sparc/sparc/timer_sun4m.c:1.32
--- src/sys/arch/sparc/sparc/timer_sun4m.c:1.31	Fri Jan 12 06:01:33 2018
+++ src/sys/arch/sparc/sparc/timer_sun4m.c	Sat Dec  4 13:23:03 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer_sun4m.c,v 1.31 2018/01/12 06:01:33 mrg Exp $	*/
+/*	$NetBSD: timer_sun4m.c,v 1.32 2021/12/04 13:23:03 andvar Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.31 2018/01/12 06:01:33 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.32 2021/12/04 13:23:03 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -290,7 +290,7 @@ timerattach_obio_4m(device_t parent, dev
 	if (sparc_ncpus > 1) {
 		/*
 		 * Note that we don't actually use this cookie after checking
-		 * it was establised, we call directly via raise_ipi() on
+		 * it was established, we call directly via raise_ipi() on
 		 * IPL_HARDCLOCK.
 		 */
 		void *hardclock_cookie;

Index: src/sys/arch/sparc64/dev/vdsk.c
diff -u src/sys/arch/sparc64/dev/vdsk.c:1.8 src/sys/arch/sparc64/dev/vdsk.c:1.9
--- src/sys/arch/sparc64/dev/vdsk.c:1.8	Sat Aug  7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/vdsk.c	Sat Dec  4 13:23:03 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vdsk.c,v 1.8 2021/08/07 16:19:05 thorpej Exp $	*/
+/*	$NetBSD: vdsk.c,v 1.9 2021/12/04 13:23:03 andvar Exp $	*/
 /*	$OpenBSD: vdsk.c,v 1.46 2015/01/25 21:42:13 kettenis Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
@@ -251,7 +251,7 @@ vdsk_attach(device_t parent, device_t se
 
 	/*
 	 * Un-configure queues before registering interrupt handlers,
-	 * such that we dont get any stale LDC packets or events.
+	 * such that we don't get any stale LDC packets or events.
 	 */
 	hv_ldc_tx_qconf(ca->ca_id, 0, 0);
 	hv_ldc_rx_qconf(ca->ca_id, 0, 0);
@@ -357,7 +357,7 @@ vdsk_attach(device_t parent, device_t se
 
 	/*
 	 * Interrupts aren't enabled during autoconf, so poll for VIO
-	 * peer-to-peer hanshake completion.
+	 * peer-to-peer handshake completion.
 	 */
 	s = splbio();
 	timeout = 10 * 1000;
@@ -370,7 +370,7 @@ vdsk_attach(device_t parent, device_t se
 	splx(s);
 
 	if (sc->sc_vio_state != VIO_ESTABLISHED) {
-	  printf("vio not establshed: %d\n", sc->sc_vio_state);
+	  printf("vio not established: %d\n", sc->sc_vio_state);
 	  return;
 	}
 

Index: src/sys/netbt/hci_link.c
diff -u src/sys/netbt/hci_link.c:1.25 src/sys/netbt/hci_link.c:1.26
--- src/sys/netbt/hci_link.c:1.25	Fri Sep  7 14:47:15 2018
+++ src/sys/netbt/hci_link.c	Sat Dec  4 13:23:04 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hci_link.c,v 1.25 2018/09/07 14:47:15 plunky Exp $	*/
+/*	$NetBSD: hci_link.c,v 1.26 2021/12/04 13:23:04 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hci_link.c,v 1.25 2018/09/07 14:47:15 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hci_link.c,v 1.26 2021/12/04 13:23:04 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -123,7 +123,7 @@ hci_acl_open(struct hci_unit *unit, bdad
 
 	case HCI_LINK_OPEN:
 		/*
-		 * If already open, halt any expiry timeouts. We dont need
+		 * If already open, halt any expiry timeouts. We don't need
 		 * to care about already invoking timeouts since refcnt >0
 		 * will keep the link alive.
 		 */
@@ -352,7 +352,7 @@ hci_acl_linkmode(struct hci_link *link)
 	/*
 	 * The link state will only be OPEN here if the mode change
 	 * was successful. So, we can proceed with L2CAP connections,
-	 * or notify already establshed channels, to allow any that
+	 * or notify already established channels, to allow any that
 	 * are dissatisfied to disconnect before we restart.
 	 */
 	next = LIST_FIRST(&l2cap_active_list);

Index: src/sys/netinet/dccp_usrreq.c
diff -u src/sys/netinet/dccp_usrreq.c:1.21 src/sys/netinet/dccp_usrreq.c:1.22
--- src/sys/netinet/dccp_usrreq.c:1.21	Sun Dec 16 17:46:58 2018
+++ src/sys/netinet/dccp_usrreq.c	Sat Dec  4 13:23:04 2021
@@ -1,5 +1,5 @@
 /*	$KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $	*/
-/*	$NetBSD: dccp_usrreq.c,v 1.21 2018/12/16 17:46:58 christos Exp $ */
+/*	$NetBSD: dccp_usrreq.c,v 1.22 2021/12/04 13:23:04 andvar Exp $ */
 
 /*
  * Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson 
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.21 2018/12/16 17:46:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.22 2021/12/04 13:23:04 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -967,7 +967,7 @@ dccp_notify(struct inpcb *inp, int errno
 }
 
 /*
- * Called when we get ICMP errors (destination unrechable,
+ * Called when we get ICMP errors (destination unreachable,
  * parameter problem, source quench, time exceeded and redirects)
  */
 void *
@@ -1231,7 +1231,7 @@ dccp_output(struct dccpcb *dp, u_int8_t 
 	}
 
 	if (dp->state != DCCPS_ESTAB && extra == 1) {
-		/* Only let cc decide when to resend if we are in establised state */
+		/* Only let cc decide when to resend if we are in established state */
 		return 0;
 	}
 
@@ -1792,7 +1792,7 @@ dccp_attach(struct socket *so, int proto
 
 #ifdef INET6
 	if (proto == PF_INET6) {
-		DCCP_DEBUG((LOG_INFO, "We are a ipv6 socket!!!\n"));
+		DCCP_DEBUG((LOG_INFO, "We are an ipv6 socket!!!\n"));
 		dp->inp_vflag |= INP_IPV6;
 	} else 
 #endif
@@ -1868,7 +1868,7 @@ dccp_connect(struct socket *so, struct s
 	dp = (struct dccpcb *)inp->inp_ppcb;
 
 	if (dp->state == DCCPS_ESTAB) {
-		DCCP_DEBUG((LOG_INFO, "Why are we in connect when we already have a established connection?\n"));
+		DCCP_DEBUG((LOG_INFO, "Why are we in connect when we already have an established connection?\n"));
 	}
 
 	dp->who = DCCP_CLIENT;
@@ -2067,7 +2067,7 @@ dccp_disconnect(struct socket *so)
 }
 
 /*
- * If we have don't have a established connection
+ * If we have don't have an established connection
  * we can call dccp_close, otherwise we can just
  * set SS_ISDISCONNECTED and flush the receive queue.
  */

Reply via email to