From: jsg <jsg@openbsd.org>
Date: Sun, 2 Jan 2022 22:36:03 +0000 (+0000)
Subject: spelling
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=df8d9afdef6b73e3daea5e6c657dbb8b744d67b3;p=openbsd

spelling
ok jmc@ reads ok tb@
---

diff --git a/sys/net/fq_codel.c b/sys/net/fq_codel.c
index e5d103cdf57..297280bf995 100644
--- a/sys/net/fq_codel.c
+++ b/sys/net/fq_codel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fq_codel.c,v 1.14 2020/12/10 06:53:38 dlg Exp $ */
+/* $OpenBSD: fq_codel.c,v 1.15 2022/01/02 22:36:03 jsg Exp $ */
 
 /*
  * Copyright (c) 2017 Mike Belopuhov
@@ -188,7 +188,7 @@ static const int64_t codel_target = 5000000;
 /* Grace period after last drop, 16 100ms intervals */
 static const int64_t codel_grace = 1600000000;
 
-/* First 399 "100 / sqrt(x)" intervarls, ns precision */
+/* First 399 "100 / sqrt(x)" intervals, ns precision */
 static const uint32_t codel_intervals[] = {
 	100000000, 70710678, 57735027, 50000000, 44721360, 40824829, 37796447,
 	35355339,  33333333, 31622777, 30151134, 28867513, 27735010, 26726124,
diff --git a/sys/net/if.c b/sys/net/if.c
index 91bacd06a77..3131fd00662 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.645 2021/12/26 01:00:32 sashan Exp $	*/
+/*	$OpenBSD: if.c,v 1.646 2022/01/02 22:36:03 jsg Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -258,7 +258,7 @@ ifinit(void)
 
 	/*
 	 * most machines boot with 4 or 5 interfaces, so size the initial map
-	 * to accomodate this
+	 * to accommodate this
 	 */
 	if_idxmap_init(8);
 
@@ -744,7 +744,7 @@ if_input_local(struct ifnet *ifp, struct mbuf *m, sa_family_t af)
 
 #if NBPFILTER > 0
 	/*
-	 * Only send packets to bpf if they are destinated to local
+	 * Only send packets to bpf if they are destined to local
 	 * addresses.
 	 *
 	 * if_input_local() is also called for SIMPLEX interfaces to
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index eb13a36f2c0..119e810f05d 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.h,v 1.9 2017/10/24 09:36:13 jsg Exp $	*/
+/*	$OpenBSD: if_ppp.h,v 1.10 2022/01/02 22:36:03 jsg Exp $	*/
 /*	$NetBSD: if_ppp.h,v 1.11 1996/03/15 02:28:05 paulus Exp $	*/
 
 /*
@@ -93,7 +93,7 @@
  */
 
 struct npioctl {
-    int		protocol;	/* PPP procotol, e.g. PPP_IP */
+    int		protocol;	/* PPP protocol, e.g. PPP_IP */
     enum NPmode	mode;
 };
 
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 3982c29bbdc..7254ee7b93d 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.190 2021/11/17 18:00:24 bket Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.191 2022/01/02 22:36:03 jsg Exp $	*/
 /*
  * Synchronous PPP link level subroutines.
  *
@@ -4015,7 +4015,7 @@ sppp_pap_scr(struct sppp *sp)
 /*
  * Send a PAP or CHAP proto packet.
  *
- * Varadic function, each of the elements for the ellipsis is of type
+ * Variadic function, each of the elements for the ellipsis is of type
  * ``size_t mlen, const u_char *msg''.  Processing will stop iff
  * mlen == 0.
  */
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 64400f95c54..7c05a90b5e1 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_types.h,v 1.23 2021/03/10 10:21:48 jsg Exp $	*/
+/*	$OpenBSD: if_types.h,v 1.24 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$NetBSD: if_types.h,v 1.17 2000/10/26 06:51:31 onoe Exp $	*/
 
 /*
@@ -205,7 +205,7 @@
 #define	IFT_USB			   0xa0	/* USB Interface */
 #define	IFT_IEEE8023ADLAG	   0xa1	/* IEEE 802.3ad Link Aggregate*/
 #define	IFT_BGPPOLICYACCOUNTING	   0xa2	/* BGP Policy Accounting */
-#define	IFT_FRF16MFRBUNDLE	   0xa3	/* FRF.16 Multilik Frame Relay*/
+#define	IFT_FRF16MFRBUNDLE	   0xa3	/* FRF.16 Multilink Frame Relay*/
 #define	IFT_H323GATEKEEPER	   0xa4	/* H323 Gatekeeper */
 #define	IFT_H323PROXY		   0xa5	/* H323 Voice and Video Proxy */
 #define	IFT_MPLS		   0xa6	/* MPLS */
diff --git a/sys/net/if_wg.c b/sys/net/if_wg.c
index 996ab20d9e4..13c48f42c54 100644
--- a/sys/net/if_wg.c
+++ b/sys/net/if_wg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wg.c,v 1.19 2021/12/16 00:54:42 deraadt Exp $ */
+/*	$OpenBSD: if_wg.c,v 1.20 2022/01/02 22:36:04 jsg Exp $ */
 
 /*
  * Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
@@ -1621,7 +1621,7 @@ wg_decap(struct wg_softc *sc, struct mbuf *m)
 	 * IP header, we just worry about the sizeof and the version, so we can
 	 * read the source address in wg_aip_lookup.
 	 *
-	 * We also need to trim the packet, as it was likely paddded before
+	 * We also need to trim the packet, as it was likely padded before
 	 * encryption. While we could drop it here, it will be more helpful to
 	 * pass it to bpf_mtap and use the counters that people are expecting
 	 * in ipv4_input and ipv6_input. We can rely on ipv4_input and
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 4d497212304..d92e38f02b5 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.1122 2021/07/07 18:38:25 sashan Exp $ */
+/*	$OpenBSD: pf.c,v 1.1123 2022/01/02 22:36:04 jsg Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1341,7 +1341,7 @@ pf_state_expires(const struct pf_state *state, uint8_t stimeout)
 	 * state->timeout by having the caller do the read (and any
 	 * chacks it needs to do on the same variable) and then pass
 	 * their view of the timeout in here for this function to use.
-	 * the only consequnce of using a stale timeout value is
+	 * the only consequence of using a stale timeout value is
 	 * that the state won't be a candidate for purging until the
 	 * next pass of the purge task.
 	 */
diff --git a/sys/net/pfvar_priv.h b/sys/net/pfvar_priv.h
index 5bba87b19a8..16716a6ddd6 100644
--- a/sys/net/pfvar_priv.h
+++ b/sys/net/pfvar_priv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar_priv.h,v 1.7 2021/06/23 06:53:52 dlg Exp $	*/
+/*	$OpenBSD: pfvar_priv.h,v 1.8 2022/01/02 22:36:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -176,7 +176,7 @@ struct pf_pdesc {
 	u_int32_t	 off;		/* protocol header offset */
 	u_int32_t	 hdrlen;	/* protocol header length */
 	u_int32_t	 p_len;		/* length of protocol payload */
-	u_int32_t	 extoff;	/* extentsion header offset */
+	u_int32_t	 extoff;	/* extension header offset */
 	u_int32_t	 fragoff;	/* fragment header offset */
 	u_int32_t	 jumbolen;	/* length from v6 jumbo header */
 	u_int32_t	 badopts;	/* v4 options or v6 routing headers */
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index e2d0c5c958d..f9a0c98d342 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.c,v 1.135 2021/07/27 09:29:09 mvs Exp $	*/
+/*	$OpenBSD: pipex.c,v 1.136 2022/01/02 22:36:04 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -199,7 +199,7 @@ pipex_init_session(struct pipex_session **rsession,
 	struct ifnet *over_ifp = NULL;
 #endif
 
-	/* Checks requeted parameters.  */
+	/* Checks requested parameters.  */
 	switch (req->pr_protocol) {
 #ifdef PIPEX_PPPOE
 	case PIPEX_PROTO_PPPOE:
@@ -1033,7 +1033,7 @@ pipex_common_input(struct pipex_session *session, struct mbuf *m0, int hlen,
 	}
 
 	/* ok,  The packet is for PIPEX */
-	m_adj(m0, hlen);/* cut off the tunnle protocol header */
+	m_adj(m0, hlen);/* cut off the tunnel protocol header */
 
 	/* ensure the mbuf length equals the PPP frame length */
 	if (m0->m_pkthdr.len < plen)
diff --git a/sys/net/pipex.h b/sys/net/pipex.h
index b29903beac7..a71f914826e 100644
--- a/sys/net/pipex.h
+++ b/sys/net/pipex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.h,v 1.30 2021/01/04 12:21:38 mvs Exp $	*/
+/*	$OpenBSD: pipex.h,v 1.31 2022/01/02 22:36:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -51,7 +51,7 @@ struct pipex_mppe_req {
 	int16_t	stateless;			/* mppe key mode.
 						   1 for stateless */
 	int16_t	keylenbits;			/* mppe key length(in bits)*/
-	u_char	master_key[PIPEX_MPPE_KEYLEN];	/* mppe mastter key */
+	u_char	master_key[PIPEX_MPPE_KEYLEN];	/* mppe master key */
 };
 
 /* pipex statistics */
diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h
index dd940b6a74a..b8c51fc4c15 100644
--- a/sys/net/pipex_local.h
+++ b/sys/net/pipex_local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex_local.h,v 1.43 2021/07/27 09:29:09 mvs Exp $	*/
+/*	$OpenBSD: pipex_local.h,v 1.44 2022/01/02 22:36:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -70,7 +70,7 @@ struct pipex_mppe {
 		reserved:14;
 	int16_t	keylenbits;			/* [I] key length */
 	int16_t keylen;				/* [I] */
-	uint16_t coher_cnt;			/* [m] cohency counter */
+	uint16_t coher_cnt;			/* [m] coherency counter */
 	struct  rc4_ctx rc4ctx;			/* [m] */
 	u_char master_key[PIPEX_MPPE_KEYLEN];	/* [m] master key of MPPE */
 	u_char session_key[PIPEX_MPPE_KEYLEN];	/* [m] session key of MPPE */
@@ -153,7 +153,7 @@ struct pipex_l2tp_session {
 
 struct cpumem;
 
-/* pppac ip-extension sessoin table */
+/* pppac ip-extension session table */
 struct pipex_session {
 	struct radix_node	ps4_rn[2];
 					/* [N] tree glue, and other values */
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 124b9df59ac..6c8d82c2e09 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp_tty.c,v 1.53 2019/11/27 17:59:13 beck Exp $	*/
+/*	$OpenBSD: ppp_tty.c,v 1.54 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $	*/
 
 /*
@@ -286,7 +286,7 @@ pppread(struct tty *tp, struct uio *uio, int flag)
     if (sc == NULL)
 	return 0;
     /*
-     * Loop waiting for input, checking that nothing disasterous
+     * Loop waiting for input, checking that nothing disastrous
      * happens in the meantime.
      */
     s = spltty();
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 37dc255537f..1ba41008c90 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radix.c,v 1.60 2021/03/10 10:21:48 jsg Exp $	*/
+/*	$OpenBSD: radix.c,v 1.61 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $	*/
 
 /*
@@ -709,7 +709,7 @@ rn_link_dupedkey(struct radix_node *tt, struct radix_node *x, int before)
  * - leaf nodes with possible rn_dupedkey list
  * - internal nodes with maybe their own mklist
  * If the mask of the route is bigger than the current branch bit then
- * a rn_mklist entrie needs to be made.
+ * a rn_mklist entry needs to be made.
  */
 void
 rn_fixup_nodes(struct radix_node *tt)
diff --git a/sys/net/route.c b/sys/net/route.c
index 73bd6f53639..641469b34f1 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.399 2021/05/25 22:45:09 bluhm Exp $	*/
+/*	$OpenBSD: route.c,v 1.400 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -1843,7 +1843,7 @@ db_print_ifa(struct ifaddr *ifa)
 }
 
 /*
- * Function to pass to rtalble_walk().
+ * Function to pass to rtable_walk().
  * Return non-zero error to abort walk.
  */
 int
diff --git a/sys/net/rtable.c b/sys/net/rtable.c
index 4cdd303200a..44c4042d326 100644
--- a/sys/net/rtable.c
+++ b/sys/net/rtable.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtable.c,v 1.75 2021/05/25 22:45:09 bluhm Exp $ */
+/*	$OpenBSD: rtable.c,v 1.76 2022/01/02 22:36:04 jsg Exp $ */
 
 /*
  * Copyright (c) 2014-2016 Martin Pieuchot
@@ -62,7 +62,7 @@ struct rtmap {
 /*
  * Array of rtableid -> rdomain mapping.
  *
- * Only used for the first index as describbed above.
+ * Only used for the first index as described above.
  */
 struct dommp {
 	unsigned int	   limit;
diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c
index 9bcde8d533d..e9a561393ff 100644
--- a/sys/netinet/ip_ipip.c
+++ b/sys/netinet/ip_ipip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipip.c,v 1.97 2021/10/23 22:19:37 bluhm Exp $ */
+/*	$OpenBSD: ip_ipip.c,v 1.98 2022/01/02 22:36:04 jsg Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -356,7 +356,7 @@ ipip_output(struct mbuf **mp, struct tdb *tdb)
 		    tdb->tdb_src.sin.sin_addr.s_addr == INADDR_ANY ||
 		    tdb->tdb_dst.sin.sin_addr.s_addr == INADDR_ANY) {
 
-			DPRINTF("unspecified tunnel endpoind address "
+			DPRINTF("unspecified tunnel endpoint address "
 			    "in SA %s/%08x",
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi));
@@ -445,7 +445,7 @@ ipip_output(struct mbuf **mp, struct tdb *tdb)
 		    tdb->tdb_src.sa.sa_family != AF_INET6 ||
 		    IN6_IS_ADDR_UNSPECIFIED(&tdb->tdb_src.sin6.sin6_addr)) {
 
-			DPRINTF("unspecified tunnel endpoind address "
+			DPRINTF("unspecified tunnel endpoint address "
 			    "in SA %s/%08x",
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi));
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index 58298d3ad91..ed18cfe74e2 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_output.c,v 1.96 2021/12/23 12:21:48 bluhm Exp $ */
+/*	$OpenBSD: ipsec_output.c,v 1.97 2022/01/02 22:36:04 jsg Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -276,7 +276,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready)
 
 	/*
 	 * If this is just an IP-IP TDB and we're told there's already an
-	 * encapsulation header or ipip_output() has encapsulted it, move on.
+	 * encapsulation header or ipip_output() has encapsulated it, move on.
 	 */
 	if (tdb->tdb_xform->xf_type == XF_IP4)
 		return ipsp_process_done(m, tdb);
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 5b8af422222..66894e2b63a 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_input.c,v 1.373 2021/12/01 12:51:09 bluhm Exp $	*/
+/*	$OpenBSD: tcp_input.c,v 1.374 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $	*/
 
 /*
@@ -3444,7 +3444,7 @@ syn_cache_lookup(struct sockaddr *src, struct sockaddr *dst,
  *
  *	-1	We were unable to create the new connection, and are
  *		aborting it.  An ACK,RST is being sent to the peer
- *		(unless we got screwey sequence numbners; see below),
+ *		(unless we got screwy sequence numbers; see below),
  *		because the 3-way handshake has been completed.  Caller
  *		should not free the mbuf, since we may be using it.  If
  *		we are not, we will free it.
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 1597852ae25..2eb5ea5cf2c 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.182 2021/11/11 18:08:18 bluhm Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.183 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -667,7 +667,7 @@ tcp6_ctlinput(int cmd, struct sockaddr *sa, u_int rdomain, void *d)
 			/*
 			 * Depending on the value of "valid" and routing table
 			 * size (mtudisc_{hi,lo}wat), we will:
-			 * - recalcurate the new MTU and create the
+			 * - recalculate the new MTU and create the
 			 *   corresponding routing entry, or
 			 * - ignore the MTU change notification.
 			 */
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 5f3ffdf40fe..08a91aa1b16 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_timer.c,v 1.68 2020/12/20 21:15:47 bluhm Exp $	*/
+/*	$OpenBSD: tcp_timer.c,v 1.69 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $	*/
 
 /*
@@ -529,7 +529,7 @@ tcp_timer_reaper(void *arg)
 	/*
 	 * This timer is necessary to delay the pool_put() after all timers
 	 * have finished, even if they were sleeping to grab the net lock.
-	 * Putting the pool_put() in a timer is sufficinet as all timers run
+	 * Putting the pool_put() in a timer is sufficient as all timers run
 	 * from the same timeout thread.  Note that neither softnet thread nor
 	 * user process may access the tcpcb after arming the reaper timer.
 	 * Freeing may run in parallel as it does not grab the net lock.
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index bdba0978bfb..24e9effe645 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.236 2021/07/26 20:44:44 bluhm Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.237 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -914,7 +914,7 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code)
 		icmp6dst.sin6_scope_id = in6_addr2scopeid(m->m_pkthdr.ph_ifidx,
 		    &icmp6dst.sin6_addr);
 		if (in6_embedscope(&icmp6dst.sin6_addr, &icmp6dst, NULL)) {
-			/* should be impossbile */
+			/* should be impossible */
 			nd6log((LOG_DEBUG,
 			    "icmp6_notify_error: in6_embedscope failed\n"));
 			goto freeit;
@@ -931,7 +931,7 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code)
 		icmp6src.sin6_scope_id = in6_addr2scopeid(m->m_pkthdr.ph_ifidx,
 		    &icmp6src.sin6_addr);
 		if (in6_embedscope(&icmp6src.sin6_addr, &icmp6src, NULL)) {
-			/* should be impossbile */
+			/* should be impossible */
 			nd6log((LOG_DEBUG,
 			    "icmp6_notify_error: in6_embedscope failed\n"));
 			goto freeit;
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 1721aa191d7..500ae0e8f49 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.c,v 1.243 2021/03/10 10:21:49 jsg Exp $	*/
+/*	$OpenBSD: in6.c,v 1.244 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $	*/
 
 /*
@@ -959,7 +959,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia6, struct ifnet *ifp)
 }
 
 /*
- * Initialize an interface's intetnet6 address
+ * Initialize an interface's inet6 address
  * and routing table entry.
  */
 int
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index e38082c9c3c..704cd09369f 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_var.h,v 1.73 2020/07/03 17:42:50 florian Exp $	*/
+/*	$OpenBSD: in6_var.h,v 1.74 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $	*/
 
 /*
@@ -133,7 +133,7 @@ struct in6_ifstat {
 	u_int64_t ifs6_out_forward;	/* # of datagrams forwarded */
 					/* NOTE: increment on outgoing if */
 	u_int64_t ifs6_out_request;	/* # of outgoing datagrams from ULP */
-					/* NOTE: does not include forwrads */
+					/* NOTE: does not include forwards */
 	u_int64_t ifs6_out_discard;	/* # of discarded datagrams */
 	u_int64_t ifs6_out_fragok;	/* # of datagrams fragmented */
 	u_int64_t ifs6_out_fragfail;	/* # of datagrams failed on fragment */
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 4b933ec6852..9bf2a28c965 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_forward.c,v 1.104 2021/12/03 17:18:34 bluhm Exp $	*/
+/*	$OpenBSD: ip6_forward.c,v 1.105 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $	*/
 
 /*
@@ -277,7 +277,7 @@ reroute:
 
 	/*
 	 * Fake scoped addresses. Note that even link-local source or
-	 * destinaion can appear, if the originating node just sends the
+	 * destination can appear, if the originating node just sends the
 	 * packet to us (without address resolution for the destination).
 	 * Since both icmp6_error and icmp6_redirect_output fill the embedded
 	 * link identifiers, we can do this stuff after making a copy for
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 142477d4fdf..07abb449632 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.238 2021/12/25 13:35:17 bluhm Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.239 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -296,7 +296,7 @@ ip6_input_if(struct mbuf **mp, int *offp, int nxt, int af, struct ifnet *ifp)
 
 	/*
 	 * If the packet has been received on a loopback interface it
-	 * can be destinated to any local address, not necessarily to
+	 * can be destined to any local address, not necessarily to
 	 * an address configured on `ifp'.
 	 */
 	if (ifp->if_flags & IFF_LOOPBACK) {
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 9141f2e6652..ba3e076b474 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.265 2021/12/23 12:21:48 bluhm Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.266 2022/01/02 22:36:04 jsg Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -655,7 +655,7 @@ reroute:
 #endif
 
 	/*
-	 * If the packet is not going on the wire it can be destinated
+	 * If the packet is not going on the wire it can be destined
 	 * to any local address.  In this case do not clear its scopes
 	 * to let ip6_input() find a matching local route.
 	 */
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h
index af6e2f33757..4a5d1582d16 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6protosw.h,v 1.14 2021/03/10 10:21:49 jsg Exp $	*/
+/*	$OpenBSD: ip6protosw.h,v 1.15 2022/01/02 22:36:05 jsg Exp $	*/
 /*	$KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $	*/
 
 /*
@@ -83,7 +83,7 @@ struct in6_addr;
  * argument type for the last arg of pr_ctlinput().
  * should be consulted only with AF_INET6 family.
  *
- * IPv6 ICMP IPv6 [exthdrs] finalhdr paylaod
+ * IPv6 ICMP IPv6 [exthdrs] finalhdr payload
  * ^    ^    ^              ^
  * |    |    ip6c_ip6       ip6c_off
  * |    ip6c_icmp6