summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/exec_elf.c4
-rw-r--r--sys/kern/kern_unveil.c6
-rw-r--r--sys/kern/spec_vnops.c4
-rw-r--r--sys/kern/subr_hibernate.c6
-rw-r--r--sys/kern/subr_percpu.c4
-rw-r--r--sys/kern/subr_pool.c6
-rw-r--r--sys/kern/subr_witness.c4
-rw-r--r--sys/kern/sys_futex.c6
-rw-r--r--sys/kern/tty_tty.c4
-rw-r--r--sys/kern/vfs_bio.c6
-rw-r--r--sys/net/bridgestp.c4
-rw-r--r--sys/net/ethertypes.h4
-rw-r--r--sys/net/if.c4
-rw-r--r--sys/net/if_bridge.h4
-rw-r--r--sys/net/if_etherbridge.c6
-rw-r--r--sys/net/if_gre.c6
-rw-r--r--sys/net/if_gre.h4
-rw-r--r--sys/net/if_pfsync.c4
-rw-r--r--sys/net/if_pfsync.h4
-rw-r--r--sys/net/if_sppp.h4
-rw-r--r--sys/net/if_types.h6
-rw-r--r--sys/net/if_veb.c4
-rw-r--r--sys/net/if_wg.c4
-rw-r--r--sys/net/ifq.h4
-rw-r--r--sys/net/ofp.h4
-rw-r--r--sys/net/pf.c4
-rw-r--r--sys/net/pf_norm.c4
-rw-r--r--sys/net/pfvar.h4
-rw-r--r--sys/net/pipex.c6
-rw-r--r--sys/net/radix.c4
-rw-r--r--sys/net/route.c6
-rw-r--r--sys/net/route.h4
-rw-r--r--sys/net/rtable.c4
-rw-r--r--sys/net/switchofp.c12
-rw-r--r--sys/net/wg_cookie.c4
-rw-r--r--sys/net80211/ieee80211_crypto_tkip.c6
-rw-r--r--sys/net80211/ieee80211_input.c6
-rw-r--r--sys/net80211/ieee80211_node.c4
-rw-r--r--sys/net80211/ieee80211_output.c6
-rw-r--r--sys/netinet/if_ether.h4
-rw-r--r--sys/netinet/in.c4
-rw-r--r--sys/netinet/in_pcb.c4
-rw-r--r--sys/netinet/ip_carp.c4
-rw-r--r--sys/netinet/ip_id.c4
-rw-r--r--sys/netinet/ip_input.c4
-rw-r--r--sys/netinet/ip_ipsp.c4
-rw-r--r--sys/netinet/ipsec_output.c4
-rw-r--r--sys/netinet/tcp_input.c10
-rw-r--r--sys/netinet/tcp_usrreq.c4
-rw-r--r--sys/netinet6/icmp6.c6
-rw-r--r--sys/netinet6/in6.c8
-rw-r--r--sys/netinet6/in6.h4
-rw-r--r--sys/netinet6/in6_src.c8
-rw-r--r--sys/netinet6/ip6_id.c6
-rw-r--r--sys/netinet6/ip6_input.c4
-rw-r--r--sys/netinet6/ip6_mroute.c4
-rw-r--r--sys/netinet6/ip6_output.c4
-rw-r--r--sys/netinet6/ip6protosw.h4
-rw-r--r--sys/netinet6/udp6_output.c4
-rw-r--r--sys/netmpls/mpls.h4
-rw-r--r--sys/netmpls/mpls_input.c4
-rw-r--r--sys/sys/domain.h4
-rw-r--r--sys/sys/exec_elf.h4
-rw-r--r--sys/sys/ktrace.h4
-rw-r--r--sys/sys/param.h4
-rw-r--r--sys/sys/shm.h4
-rw-r--r--sys/sys/sysctl.h4
-rw-r--r--sys/sys/wait.h4
68 files changed, 162 insertions, 162 deletions
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index 33db17a1229..c7571e3fac9 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.c,v 1.159 2021/03/08 05:57:34 deraadt Exp $ */
+/* $OpenBSD: exec_elf.c,v 1.160 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 1996 Per Fogelstrom
@@ -192,7 +192,7 @@ int
elf_check_header(Elf_Ehdr *ehdr)
{
/*
- * We need to check magic, class size, endianess, and version before
+ * We need to check magic, class size, endianness, and version before
* we look at the rest of the Elf_Ehdr structure. These few elements
* are represented in a machine independent fashion.
*/
diff --git a/sys/kern/kern_unveil.c b/sys/kern/kern_unveil.c
index 0822248e435..acdd8672bb8 100644
--- a/sys/kern/kern_unveil.c
+++ b/sys/kern/kern_unveil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_unveil.c,v 1.39 2020/03/22 20:23:36 anton Exp $ */
+/* $OpenBSD: kern_unveil.c,v 1.40 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 2017-2019 Bob Beck <beck@openbsd.org>
@@ -669,7 +669,7 @@ unveil_add(struct proc *p, struct nameidata *ndp, const char *permissions)
/*
* XXX this will probably change.
- * XXX collapse down later once debug surely unneded
+ * XXX collapse down later once debug surely unneeded
*/
int
unveil_flagmatch(struct nameidata *ni, u_char flags)
@@ -887,7 +887,7 @@ unveil_check_final(struct proc *p, struct nameidata *ni)
return ENOENT;
}
- /* directry and flags match, update match */
+ /* directory and flags match, update match */
ni->ni_unveil_match = uv;
goto done;
}
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 6f7d21fddae..b55c3941f8e 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.102 2020/06/11 09:18:43 mpi Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.103 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -509,7 +509,7 @@ spec_close(void *v)
} else {
/*
* If the vnode is locked, then we are in the midst
- * of forcably closing the device, otherwise we only
+ * of forcibly closing the device, otherwise we only
* close on last reference.
*/
if (vcount(vp) > 1 && (vp->v_flag & VXLOCK) == 0)
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c
index bcae1db1eaa..3a72fb55048 100644
--- a/sys/kern/subr_hibernate.c
+++ b/sys/kern/subr_hibernate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_hibernate.c,v 1.125 2018/06/21 07:49:13 mlarkin Exp $ */
+/* $OpenBSD: subr_hibernate.c,v 1.126 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl>
@@ -308,7 +308,7 @@ hib_free(struct hiballoc_arena *arena, void *addr)
/*
* Initialize hiballoc.
*
- * The allocator will manage memmory at ptr, which is len bytes.
+ * The allocator will manage memory at ptr, which is len bytes.
*/
int
hiballoc_init(struct hiballoc_arena *arena, void *p_ptr, size_t p_len)
@@ -1788,7 +1788,7 @@ hibernate_read_chunks(union hibernate_info *hib, paddr_t pig_start,
/*
* These mappings go into the resuming kernel's page table, and are
- * used only during image read. They dissappear from existence
+ * used only during image read. They disappear from existence
* when the suspended kernel is unpacked on top of us.
*/
tempva = (vaddr_t)km_alloc(MAXPHYS + PAGE_SIZE, &kv_any, &kp_none,
diff --git a/sys/kern/subr_percpu.c b/sys/kern/subr_percpu.c
index 96e3e148bd3..ef46eae29a0 100644
--- a/sys/kern/subr_percpu.c
+++ b/sys/kern/subr_percpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_percpu.c,v 1.8 2017/09/08 05:36:53 deraadt Exp $ */
+/* $OpenBSD: subr_percpu.c,v 1.9 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 2016 David Gwynne <dlg@openbsd.org>
@@ -293,7 +293,7 @@ counters_alloc(unsigned int n)
struct cpumem *
counters_alloc_ncpus(struct cpumem *cm, unsigned int n)
{
- /* this is unecessary, but symmetrical */
+ /* this is unnecessary, but symmetrical */
return (cpumem_malloc_ncpus(cm, n * sizeof(uint64_t), M_COUNTERS));
}
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index 7c1a8fab913..ab38e8d3a3a 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_pool.c,v 1.232 2021/01/06 07:51:40 claudio Exp $ */
+/* $OpenBSD: subr_pool.c,v 1.233 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */
/*-
@@ -473,7 +473,7 @@ pool_init(struct pool *pp, size_t size, u_int align, int ipl, int flags,
pool_init(&phpool, sizeof(struct pool_page_header), 0,
IPL_HIGH, 0, "phpool", NULL);
- /* make sure phpool wont "recurse" */
+ /* make sure phpool won't "recurse" */
KASSERT(POOL_INPGHDR(&phpool));
}
@@ -1618,7 +1618,7 @@ pool_allocator_alloc(struct pool *pp, int flags, int *slowdown)
if (v != NULL && POOL_INPGHDR(pp)) {
vaddr_t addr = (vaddr_t)v;
if ((addr & pp->pr_pgmask) != addr) {
- panic("%s: %s page address %p isnt aligned to %u",
+ panic("%s: %s page address %p isn't aligned to %u",
__func__, pp->pr_wchan, v, pp->pr_pgsize);
}
}
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index f160bfff057..e23db1c4907 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_witness.c,v 1.45 2021/02/08 10:51:02 mpi Exp $ */
+/* $OpenBSD: subr_witness.c,v 1.46 2021/03/10 10:21:47 jsg Exp $ */
/*-
* Copyright (c) 2008 Isilon Systems, Inc.
@@ -1693,7 +1693,7 @@ isitmychild(struct witness *parent, struct witness *child)
}
/*
- * Checks if @descendant is a direct or inderect descendant of @ancestor.
+ * Checks if @descendant is a direct or indirect descendant of @ancestor.
*/
static int
isitmydescendant(struct witness *ancestor, struct witness *descendant)
diff --git a/sys/kern/sys_futex.c b/sys/kern/sys_futex.c
index 2f77cc92764..5ef16fffa9a 100644
--- a/sys/kern/sys_futex.c
+++ b/sys/kern/sys_futex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_futex.c,v 1.16 2020/04/06 02:44:31 cheloha Exp $ */
+/* $OpenBSD: sys_futex.c,v 1.17 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 2016-2017 Martin Pieuchot
@@ -205,7 +205,7 @@ futex_put(struct futex *f)
/*
* Put the current thread on the sleep queue of the futex at address
* ``uaddr''. Let it sleep for the specified ``timeout'' time, or
- * indefinitly if the argument is NULL.
+ * indefinitely if the argument is NULL.
*/
int
futex_wait(uint32_t *uaddr, uint32_t val, const struct timespec *timeout,
@@ -255,7 +255,7 @@ futex_wait(uint32_t *uaddr, uint32_t val, const struct timespec *timeout,
if (error == ERESTART)
error = ECANCELED;
else if (error == EWOULDBLOCK) {
- /* A race occured between a wakeup and a timeout. */
+ /* A race occurred between a wakeup and a timeout. */
if (p->p_futex == NULL)
error = 0;
else
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index c25aa81a11c..acd8b0d33e9 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_tty.c,v 1.27 2020/06/11 09:18:43 mpi Exp $ */
+/* $OpenBSD: tty_tty.c,v 1.28 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: tty_tty.c,v 1.13 1996/03/30 22:24:46 christos Exp $ */
/*-
@@ -129,7 +129,7 @@ cttyioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
case TIOCCHKVERAUTH:
/*
* It's not clear when or what these checks are for.
- * How can we reach this code with a differnt ruid?
+ * How can we reach this code with a different ruid?
* The ppid check is also more porous than desired.
* Nevertheless, the checks reflect the original intention;
* namely, that it be the same user using the same shell.
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index c53b1b67ffe..a6738618b9b 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_bio.c,v 1.204 2020/10/05 01:56:17 asou Exp $ */
+/* $OpenBSD: vfs_bio.c,v 1.205 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */
/*
@@ -883,7 +883,7 @@ brelse(struct buf *bp)
KASSERT(bp->b_bufsize > 0);
/*
- * softdep is basically incompatible with not cacheing buffers
+ * softdep is basically incompatible with not caching buffers
* that have dependencies, so this buffer must be cached
*/
if (LIST_FIRST(&bp->b_dep) != NULL)
@@ -1433,7 +1433,7 @@ buf_adjcnt(struct buf *bp, long ncount)
* This implementation adds support for multiple 2q caches.
*
* If we have more than one 2q cache, as bufs fall off the cold queue
- * for recyclying, bufs that have been warm before (which retain the
+ * for recycling, bufs that have been warm before (which retain the
* B_WARM flag in addition to B_COLD) can be put into the hot queue of
* a second level 2Q cache. buffers which are only B_COLD are
* recycled. Bufs falling off the last cache's cold queue are always
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 6366841e1e1..79d8f2c5e3d 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bridgestp.c,v 1.76 2021/01/25 19:47:16 mvs Exp $ */
+/* $OpenBSD: bridgestp.c,v 1.77 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -2198,7 +2198,7 @@ bstp_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
/* convert seconds to ticks */
val *= BSTP_TICK_VAL;
- /* value can only be changed in leagacy stp mode */
+ /* value can only be changed in legacy stp mode */
if (bs->bs_protover != BSTP_PROTO_STP) {
err = EPERM;
break;
diff --git a/sys/net/ethertypes.h b/sys/net/ethertypes.h
index a5228e6f44f..ef50e6bf088 100644
--- a/sys/net/ethertypes.h
+++ b/sys/net/ethertypes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ethertypes.h,v 1.13 2019/10/29 03:19:16 dlg Exp $ */
+/* $OpenBSD: ethertypes.h,v 1.14 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: ethertypes.h,v 1.13 2002/02/10 01:28:32 thorpej Exp $ */
/*
@@ -102,7 +102,7 @@
#define ETHERTYPE_NBPVCD 0x3C00 /* 3Com NBP virtual circuit datagram (like XNS SPP) not registered */
#define ETHERTYPE_NBPSCD 0x3C01 /* 3Com NBP System control datagram not registered */
#define ETHERTYPE_NBPCREQ 0x3C02 /* 3Com NBP Connect request (virtual cct) not registered */
-#define ETHERTYPE_NBPCRSP 0x3C03 /* 3Com NBP Connect repsonse not registered */
+#define ETHERTYPE_NBPCRSP 0x3C03 /* 3Com NBP Connect response not registered */
#define ETHERTYPE_NBPCC 0x3C04 /* 3Com NBP Connect complete not registered */
#define ETHERTYPE_NBPCLREQ 0x3C05 /* 3Com NBP Close request (virtual cct) not registered */
#define ETHERTYPE_NBPCLRSP 0x3C06 /* 3Com NBP Close response not registered */
diff --git a/sys/net/if.c b/sys/net/if.c
index 6ed56de13a1..3aec05d33b8 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.633 2021/03/09 20:03:50 anton Exp $ */
+/* $OpenBSD: if.c,v 1.634 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -667,7 +667,7 @@ if_qstart_compat(struct ifqueue *ifq)
* the stack assumes that an interface can have multiple
* transmit rings, but a lot of drivers are still written
* so that interfaces and send rings have a 1:1 mapping.
- * this provides compatability between the stack and the older
+ * this provides compatibility between the stack and the older
* drivers by translating from the only queue they have
* (ifp->if_snd) back to the interface and calling if_start.
*/
diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h
index 0838142d5cb..ed384bed9f1 100644
--- a/sys/net/if_bridge.h
+++ b/sys/net/if_bridge.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.h,v 1.71 2021/01/25 19:47:16 mvs Exp $ */
+/* $OpenBSD: if_bridge.h,v 1.72 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -289,7 +289,7 @@ struct brl_node {
struct ether_addr brl_dst; /* destination mac address */
u_int16_t brl_tag; /* pf tag ID */
u_int8_t brl_action; /* what to do with match */
- u_int8_t brl_flags; /* comparision flags */
+ u_int8_t brl_flags; /* comparison flags */
struct ifbrarpf brl_arpf; /* arp filter */
};
diff --git a/sys/net/if_etherbridge.c b/sys/net/if_etherbridge.c
index d3488029d36..b4a07b5eefc 100644
--- a/sys/net/if_etherbridge.c
+++ b/sys/net/if_etherbridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_etherbridge.c,v 1.5 2021/02/26 08:31:23 dlg Exp $ */
+/* $OpenBSD: if_etherbridge.c,v 1.6 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 2018, 2021 David Gwynne <dlg@openbsd.org>
@@ -374,7 +374,7 @@ etherbridge_map(struct etherbridge *eb, void *port, uint64_t eba)
if (nebe != NULL) {
/*
- * the new entry didnt make it into the
+ * the new entry didn't make it into the
* table, so it can be freed directly.
*/
ebe_free(nebe);
@@ -440,7 +440,7 @@ etherbridge_add_addr(struct etherbridge *eb, void *port,
if (error != 0) {
/*
- * the new entry didnt make it into the
+ * the new entry didn't make it into the
* table, so it can be freed directly.
*/
ebe_free(nebe);
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 4a07a1746d6..d2f6524dd26 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gre.c,v 1.170 2021/02/27 09:21:22 dlg Exp $ */
+/* $OpenBSD: if_gre.c,v 1.171 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -1659,7 +1659,7 @@ mgre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dest,
rt = rt_getll(rt0);
- /* chech rt_expire? */
+ /* check rt_expire? */
if (ISSET(rt->rt_flags, RTF_REJECT)) {
error = (rt == rt0) ? EHOSTDOWN : EHOSTUNREACH;
goto drop;
@@ -2952,7 +2952,7 @@ gre_keepalive_send(void *arg)
uint8_t tos;
/*
- * re-schedule immediately, so we deal with incomplete configuation
+ * re-schedule immediately, so we deal with incomplete configuration
* or temporary errors.
*/
if (sc->sc_ka_timeo)
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 8ade4d531bf..d09fc16c048 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gre.h,v 1.15 2018/02/07 22:30:59 dlg Exp $ */
+/* $OpenBSD: if_gre.h,v 1.16 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: if_gre.h,v 1.5 1999/11/19 20:41:19 thorpej Exp $ */
/*
@@ -54,7 +54,7 @@ struct gre_h {
u_int_32 seq_num Sequence number to allow for packet order
Present if (seq_pres ==1 ).
- struct gre_sre[] routing Routing fileds (see below)
+ struct gre_sre[] routing Routing fields (see below)
Present if (rt_pres == 1)
*/
} __packed;
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index f6088c8bee5..b90aa934de4 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.c,v 1.287 2021/02/25 02:48:21 dlg Exp $ */
+/* $OpenBSD: if_pfsync.c,v 1.288 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -2294,7 +2294,7 @@ pfsync_delete_state(struct pf_state *st)
pfsync_q_del(st);
/*
* FALLTHROUGH to putting it on the del list
- * Note on refence count bookeeping:
+ * Note on reference count bookkeeping:
* pfsync_q_del() drops reference for queue
* ownership. But the st entry survives, because
* our caller still holds a reference.
diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h
index 2c9bedcc920..2520c87a36c 100644
--- a/sys/net/if_pfsync.h
+++ b/sys/net/if_pfsync.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.h,v 1.55 2021/02/04 00:55:41 sashan Exp $ */
+/* $OpenBSD: if_pfsync.h,v 1.56 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -50,7 +50,7 @@
#define PFSYNC_ACT_CLR 0 /* clear all states */
#define PFSYNC_ACT_OINS 1 /* old insert state */
-#define PFSYNC_ACT_INS_ACK 2 /* ack of insterted state */
+#define PFSYNC_ACT_INS_ACK 2 /* ack of inserted state */
#define PFSYNC_ACT_OUPD 3 /* old update state */
#define PFSYNC_ACT_UPD_C 4 /* "compressed" update state */
#define PFSYNC_ACT_UPD_REQ 5 /* request "uncompressed" state */
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 9688699762c..ff559fcc369 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sppp.h,v 1.27 2019/06/24 21:36:53 kn Exp $ */
+/* $OpenBSD: if_sppp.h,v 1.28 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: if_sppp.h,v 1.2.2.1 1999/04/04 06:57:39 explorer Exp $ */
/*
@@ -45,7 +45,7 @@
/*
* Don't change the order of this. Ordering the phases this way allows
- * for a comparision of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
+ * for a comparison of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
* know whether LCP is up.
*/
enum ppp_phase {
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 03af05e3b2a..64400f95c54 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_types.h,v 1.22 2020/06/21 11:25:54 dlg Exp $ */
+/* $OpenBSD: if_types.h,v 1.23 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: if_types.h,v 1.17 2000/10/26 06:51:31 onoe Exp $ */
/*
@@ -249,8 +249,8 @@
#define IFT_SIPSIG 0xcc /* SIP Signaling */
#define IFT_DOCSCABLEUPSTREAMCHANNEL 0xcd /* CATV Upstream Channel */
#define IFT_ECONET 0xce /* Acorn Econet */
-#define IFT_PON155 0xcf /* FSAN 155Mb Symetrical PON interface */
-#define IFT_PON622 0xd0 /* FSAN 622Mb Symetrical PON interface */
+#define IFT_PON155 0xcf /* FSAN 155Mb Symmetrical PON interface */
+#define IFT_PON622 0xd0 /* FSAN 622Mb Symmetrical PON interface */
#define IFT_BRIDGE 0xd1 /* Transparent bridge interface */
#define IFT_LINEGROUP 0xd2 /* Interface common to multiple lines */
#define IFT_VOICEEMFGD 0xd3 /* voice E&M Feature Group D */
diff --git a/sys/net/if_veb.c b/sys/net/if_veb.c
index 311503e0627..6b141bfb5cf 100644
--- a/sys/net/if_veb.c
+++ b/sys/net/if_veb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_veb.c,v 1.15 2021/03/05 06:44:09 dlg Exp $ */
+/* $OpenBSD: if_veb.c,v 1.16 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2021 David Gwynne <dlg@openbsd.org>
@@ -809,7 +809,7 @@ veb_broadcast(struct veb_softc *sc, struct veb_port *rp, struct mbuf *m0,
#if NPF > 0
/*
- * we couldnt find a specific port to send this packet to,
+ * we couldn't find a specific port to send this packet to,
* but pf should still have a chance to apply policy to it.
* let pf look at it, but use the veb interface as a proxy.
*/
diff --git a/sys/net/if_wg.c b/sys/net/if_wg.c
index 23557126787..7bdf5ff36c6 100644
--- a/sys/net/if_wg.c
+++ b/sys/net/if_wg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wg.c,v 1.15 2021/01/25 09:11:36 yasuoka Exp $ */
+/* $OpenBSD: if_wg.c,v 1.16 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
@@ -885,7 +885,7 @@ wg_tag_get(struct mbuf *m)
/*
* The following section handles the timeout callbacks for a WireGuard session.
- * These functions provide an "event based" model for controling wg(8) session
+ * These functions provide an "event based" model for controlling wg(8) session
* timers. All function calls occur after the specified event below.
*
* wg_timers_event_data_sent:
diff --git a/sys/net/ifq.h b/sys/net/ifq.h
index fe8aa7781df..2d34d251a44 100644
--- a/sys/net/ifq.h
+++ b/sys/net/ifq.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifq.h,v 1.32 2020/07/07 00:00:03 dlg Exp $ */
+/* $OpenBSD: ifq.h,v 1.33 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2015 David Gwynne <dlg@openbsd.org>
@@ -207,7 +207,7 @@ struct ifiqueue {
*
* === ifq_mfreem() and ifq_mfreeml()
*
- * A goal of the API is to avoid freeing an mbuf while mutexs are
+ * A goal of the API is to avoid freeing an mbuf while mutexes are
* held. Because the ifq API manages the lock on behalf of the backend
* ifqops, the backend should not directly free mbufs. If a conditioner
* backend needs to drop a packet during the handling of ifqop_deq_begin,
diff --git a/sys/net/ofp.h b/sys/net/ofp.h
index 8ba6ce1a90d..f57b582f112 100644
--- a/sys/net/ofp.h
+++ b/sys/net/ofp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofp.h,v 1.13 2016/12/02 17:10:20 rzalamena Exp $ */
+/* $OpenBSD: ofp.h,v 1.14 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org>
@@ -276,7 +276,7 @@ struct ofp_instruction_experimenter {
#define OFP_ACTION_POP_VLAN 18 /* Pop the outer VLAN tag */
#define OFP_ACTION_PUSH_MPLS 19 /* Push a new MPLS tag */
#define OFP_ACTION_POP_MPLS 20 /* Pop the outer MPLS tag */
-#define OFP_ACTION_SET_QUEUE 21 /* Set queue id when outputing to a port */
+#define OFP_ACTION_SET_QUEUE 21 /* Set queue id when outputting to a port */
#define OFP_ACTION_GROUP 22 /* Apply group */
#define OFP_ACTION_SET_NW_TTL 23 /* Set IP TTL */
#define OFP_ACTION_DEC_NW_TTL 24 /* Decrement IP TTL */
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 8eee8df8c23..28aa6157552 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.1113 2021/03/01 11:05:42 bluhm Exp $ */
+/* $OpenBSD: pf.c,v 1.1114 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -3151,7 +3151,7 @@ pf_step_into_anchor(struct pf_test_ctx *ctx, struct pf_rule *r)
} else {
rv = pf_match_rule(ctx, &r->anchor->ruleset);
/*
- * Unless errors occured, stop iff any rule matched
+ * Unless errors occurred, stop iff any rule matched
* within quick anchors.
*/
if (rv != PF_TEST_FAIL && r->quick == PF_TEST_QUICK &&
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index 0e892c5d28d..a2f26c4f354 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_norm.c,v 1.222 2021/03/01 11:05:42 bluhm Exp $ */
+/* $OpenBSD: pf_norm.c,v 1.223 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -1338,7 +1338,7 @@ pf_normalize_tcp_stateful(struct pf_pdesc *pd, u_short *reason,
}
if (copyback) {
- /* Copyback the options, caller copys back header */
+ /* Copyback the options, caller copies back header */
*writeback = 1;
m_copyback(pd->m, pd->off + sizeof(*th), olen, opts, M_NOWAIT);
}
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index ae7742877ad..b16b915230d 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfvar.h,v 1.499 2021/02/01 00:31:05 dlg Exp $ */
+/* $OpenBSD: pfvar.h,v 1.500 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -128,7 +128,7 @@ enum { PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED,
/*
* The number of entries in the fragment queue must be limited
- * to avoid DoS by linear seaching. Instead of a global limit,
+ * to avoid DoS by linear searching. Instead of a global limit,
* use a limit per entry point. For large packets these sum up.
*/
#define PF_FRAG_ENTRY_LIMIT 64
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index 978d184494f..83cafd0c99a 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pipex.c,v 1.131 2021/02/25 02:48:21 dlg Exp $ */
+/* $OpenBSD: pipex.c,v 1.132 2021/03/10 10:21:48 jsg Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -2332,7 +2332,7 @@ pipex_mppe_output(struct mbuf *m0, struct pipex_session *session,
/*
* create a deep-copy if the mbuf has a shared mbuf cluster.
- * this is required to handle cases of tcp retransmition.
+ * this is required to handle cases of tcp retransmission.
*/
for (m = m0; m != NULL; m = m->m_next) {
if (M_READONLY(m)) {
@@ -2468,7 +2468,7 @@ pipex_ccp_output(struct pipex_session *session, int code, int id)
}
#endif
/***********************************************************************
- * Miscellaneous fuctions
+ * Miscellaneous functions
***********************************************************************/
/* adapted from FreeBSD:src/usr.sbin/ppp/tcpmss.c */
/*
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 563f32e2c80..37dc255537f 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radix.c,v 1.59 2019/07/08 17:49:57 mpi Exp $ */
+/* $OpenBSD: radix.c,v 1.60 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $ */
/*
@@ -836,7 +836,7 @@ rn_del_radix_mask(struct radix_node *tt)
"inconsistent mklist refcount\n");
}
/*
- * If we end up here tt should be m->rm_leaf and therefor
+ * If we end up here tt should be m->rm_leaf and therefore
* tt should be the head of a multipath chain.
* If this is not the case the table is no longer consistent.
*/
diff --git a/sys/net/route.c b/sys/net/route.c
index 99c3671d80b..3e3c32617df 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.397 2020/10/29 21:15:27 denis Exp $ */
+/* $OpenBSD: route.c,v 1.398 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -450,7 +450,7 @@ rt_setgwroute(struct rtentry *rt, u_int rtableid)
rt->rt_mtu = nhrt->rt_mtu;
/*
- * To avoid reference counting problems when writting link-layer
+ * To avoid reference counting problems when writing link-layer
* addresses in an outgoing packet, we ensure that the lifetime
* of a cached entry is greater than the bigger lifetime of the
* gateway entries it is pointed by.
@@ -1253,7 +1253,7 @@ rt_ifa_addlocal(struct ifaddr *ifa)
}
/*
- * Remove local rtentry of ifa's addresss if it exists.
+ * Remove local rtentry of ifa's address if it exists.
*/
int
rt_ifa_dellocal(struct ifaddr *ifa)
diff --git a/sys/net/route.h b/sys/net/route.h
index 492edcfcb6a..f78022d6af0 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.h,v 1.183 2020/10/29 21:15:27 denis Exp $ */
+/* $OpenBSD: route.h,v 1.184 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */
/*
@@ -291,7 +291,7 @@ struct rt_msghdr {
/*
* setsockopt defines used for the filtering.
*/
-#define ROUTE_MSGFILTER 1 /* bitmask to specifiy which types should be
+#define ROUTE_MSGFILTER 1 /* bitmask to specify which types should be
sent to the client. */
#define ROUTE_TABLEFILTER 2 /* change routing table the socket is listening
on, RTABLE_ANY listens on all tables. */
diff --git a/sys/net/rtable.c b/sys/net/rtable.c
index 9a9f2a65c31..d88544e2a22 100644
--- a/sys/net/rtable.c
+++ b/sys/net/rtable.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtable.c,v 1.72 2020/11/07 09:51:40 denis Exp $ */
+/* $OpenBSD: rtable.c,v 1.73 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2014-2016 Martin Pieuchot
@@ -142,7 +142,7 @@ rtmap_dtor(void *null, void *xmap)
struct rtmap *map = xmap;
/*
- * doesnt need to be serialized since this is the last reference
+ * doesn't need to be serialized since this is the last reference
* to this map. there's nothing to race against.
*/
free(map->tbl, M_RTABLE, map->limit * sizeof(*map[0].tbl));
diff --git a/sys/net/switchofp.c b/sys/net/switchofp.c
index 4b9e6a114fa..9077d5d6d44 100644
--- a/sys/net/switchofp.c
+++ b/sys/net/switchofp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: switchofp.c,v 1.79 2021/02/25 02:48:21 dlg Exp $ */
+/* $OpenBSD: switchofp.c,v 1.80 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2016 Kazuya GODA <goda@openbsd.org>
@@ -1339,7 +1339,7 @@ swofp_flow_table_delete(struct switch_softc *sc, uint16_t table_id)
LIST_FOREACH_SAFE(swfe, &swft->swft_flow_list, swfe_next, tswfe) {
/*
- * Flows are deleted force becouse of deleting table,
+ * Flows are deleted force because of deleting table,
* s it's not necessary to send flow remove message.
*/
swfe->swfe_flags &= ~(OFP_FLOWFLAG_SEND_FLOW_REMOVED);
@@ -3056,7 +3056,7 @@ swofp_ox_match_uint32(struct switch_flow_classify *swfcl,
switch (OFP_OXM_GET_FIELD(oxm)) {
case OFP_XM_T_IN_PORT:
/*
- * in_port isn't network byte order becouse
+ * in_port isn't network byte order because
* it's pipeline match field.
*/
in = htonl(swfcl->swfcl_in_port);
@@ -5699,7 +5699,7 @@ swofp_recv_packet_out(struct switch_softc *sc, struct mbuf *m)
* splited some OpenFlow messages. OpenFlow Switch Specification says that
* "NO OBJECT CAN BE SPLIT ACROSS TWO MESSAGES". In other words, point of
* splittig is different per reply, so switch(4) builds multipart message using
- * swofp_mpms_* functions which splits messsages not to object across
+ * swofp_mpms_* functions which splits messages not to object across
* two messages.
*/
int
@@ -6336,7 +6336,7 @@ swofp_table_features_put_oxm(struct mbuf *m, int *off, uint16_t tp_type)
}
/*
- * It's always 4 byte for padding becouse struct ofp_ox_mach and
+ * It's always 4 byte for padding because struct ofp_ox_mach and
* struct ofp_table_feature_property are 4 byte.
*/
if ((supported & 0x1) == 0) {
@@ -6458,7 +6458,7 @@ swofp_mp_recv_table_features(struct switch_softc *sc, struct mbuf *m)
goto error;
TAILQ_FOREACH(swft, &ofs->swofs_table_list, swft_table_next) {
- /* using mbuf becouse table featrues struct is variable length*/
+ /* using mbuf because table features struct is variable length*/
MGETHDR(n, M_DONTWAIT, MT_DATA);
if (n == NULL)
goto error;
diff --git a/sys/net/wg_cookie.c b/sys/net/wg_cookie.c
index 61c6c409fc7..87a9930deff 100644
--- a/sys/net/wg_cookie.c
+++ b/sys/net/wg_cookie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wg_cookie.c,v 1.2 2020/12/09 05:53:33 tb Exp $ */
+/* $OpenBSD: wg_cookie.c,v 1.3 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2019-2020 Matt Dunwoodie <ncon@noconroy.net>
@@ -175,7 +175,7 @@ cookie_checker_validate_macs(struct cookie_checker *cc, struct cookie_macs *cm,
cookie_macs_mac1(&our_cm, buf, len, cc->cc_mac1_key);
rw_exit_read(&cc->cc_key_lock);
- /* If mac1 is invald, we want to drop the packet */
+ /* If mac1 is invalid, we want to drop the packet */
if (timingsafe_bcmp(our_cm.mac1, cm->mac1, COOKIE_MAC_SIZE) != 0)
return EINVAL;
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c
index 2e39baf0b87..7e15a3c9b34 100644
--- a/sys/net80211/ieee80211_crypto_tkip.c
+++ b/sys/net80211/ieee80211_crypto_tkip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_crypto_tkip.c,v 1.32 2020/07/15 22:49:07 cheloha Exp $ */
+/* $OpenBSD: ieee80211_crypto_tkip.c,v 1.33 2021/03/10 10:21:48 jsg Exp $ */
/*-
* Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -111,7 +111,7 @@ struct ieee80211_tkip_frame {
/*
* Compute TKIP MIC over an mbuf chain starting "off" bytes from the
- * beginning. This function should be kept independant from the software
+ * beginning. This function should be kept independent from the software
* TKIP crypto code so that drivers doing hardware crypto but not MIC can
* call it without a software crypto context.
*/
@@ -373,7 +373,7 @@ ieee80211_tkip_decrypt(struct ieee80211com *ic, struct mbuf *m0,
}
/*
- * Get the frame's Tansmit Sequence Counter (TSC), and a pointer to
+ * Get the frame's Transmit Sequence Counter (TSC), and a pointer to
* our last-seen Receive Sequence Counter (RSC) with which we can
* detect replays.
*/
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 5c8f88bd13a..be88453fc70 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.228 2020/12/10 12:52:49 stsp Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.229 2021/03/10 10:21:48 jsg Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -808,7 +808,7 @@ ieee80211_input_ba(struct ieee80211com *ic, struct mbuf *m,
if (count > ba->ba_winsize) {
/*
* Check whether we're consistently behind the window,
- * and let the window move forward if neccessary.
+ * and let the window move forward if necessary.
*/
if (ba->ba_winmiss < IEEE80211_BA_MAX_WINMISS) {
if (ba->ba_missedsn == ((sn - 1) & 0xfff))
@@ -1358,7 +1358,7 @@ ieee80211_parse_rsn_body(struct ieee80211com *ic, const u_int8_t *frm,
rsn->rsn_groupcipher = IEEE80211_CIPHER_CCMP;
rsn->rsn_nciphers = 1;
rsn->rsn_ciphers = IEEE80211_CIPHER_CCMP;
- /* if Group Management Cipher Suite missing, defaut to BIP */
+ /* if Group Management Cipher Suite missing, default to BIP */
rsn->rsn_groupmgmtcipher = IEEE80211_CIPHER_BIP;
/* if AKM Suite missing, default to 802.1X */
rsn->rsn_nakms = 1;
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 426e8e1e68a..610db9f671d 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.c,v 1.182 2020/05/31 09:08:33 stsp Exp $ */
+/* $OpenBSD: ieee80211_node.c,v 1.183 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -752,7 +752,7 @@ ieee80211_node_lateattach(struct ifnet *ifp)
ni = ieee80211_alloc_node_helper(ic);
if (ni == NULL)
- panic("unable to setup inital BSS node");
+ panic("unable to setup initial BSS node");
ni->ni_chan = IEEE80211_CHAN_ANYC;
ic->ic_bss = ieee80211_ref_node(ni);
ic->ic_txpower = IEEE80211_TXPOWER_MAX;
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 7545f4b0249..58f654273f7 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_output.c,v 1.132 2020/12/08 15:52:04 stsp Exp $ */
+/* $OpenBSD: ieee80211_output.c,v 1.133 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */
/*-
@@ -450,7 +450,7 @@ ieee80211_can_use_ampdu(struct ieee80211com *ic, struct ieee80211_node *ni)
/*
* Don't use A-MPDU on non-encrypted networks. There are devices
* with buggy firmware which allow an attacker to inject 802.11
- * frames into a wifi network by embedding rouge A-MPDU subframes
+ * frames into a wifi network by embedding rogue A-MPDU subframes
* in an arbitrary data payload (e.g. PNG images) which may end
* up appearing as actual frames after de-aggregation by a buggy
* device; see https://github.com/rpp0/aggr-inject for details.
@@ -1687,7 +1687,7 @@ ieee80211_get_delba(struct ieee80211com *ic, struct ieee80211_node *ni,
}
/*-
- * SA Query Request/Reponse frame format:
+ * SA Query Request/Response frame format:
* [1] Category
* [1] Action
* [16] Transaction Identifier
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 83fefe51a97..a3e5dc77eb3 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.h,v 1.80 2021/03/05 06:44:09 dlg Exp $ */
+/* $OpenBSD: if_ether.h,v 1.81 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $ */
/*
@@ -138,7 +138,7 @@ struct ether_vlan_header {
#define ETHERMIN (ETHER_MIN_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN)
/*
- * Ethernet CRC32 polynomials (big- and little-endian verions).
+ * Ethernet CRC32 polynomials (big- and little-endian versions).
*/
#define ETHER_CRC_POLY_LE 0xedb88320
#define ETHER_CRC_POLY_BE 0x04c11db6
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index a7c3b7724b7..8ea29ad341b 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in.c,v 1.170 2020/05/27 11:19:28 mpi Exp $ */
+/* $OpenBSD: in.c,v 1.171 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */
/*
@@ -682,7 +682,7 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
/*
* Add the address to the local list and the global tree. If an
- * error occured, put back the original address.
+ * error occurred, put back the original address.
*/
ifa_add(ifp, &ia->ia_ifa);
rterror = rt_ifa_addlocal(&ia->ia_ifa);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index f588061f858..cd60f66b50a 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_pcb.c,v 1.254 2021/02/11 10:41:19 patrick Exp $ */
+/* $OpenBSD: in_pcb.c,v 1.255 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */
/*
@@ -970,7 +970,7 @@ in_pcbselsrc(struct in_addr **insrc, struct sockaddr_in *sin,
/*
* Use preferred source address if :
* - destination is not onlink
- * - preferred source addresss is set
+ * - preferred source address is set
* - output interface is UP
*/
if (ro->ro_rt && !(ro->ro_rt->rt_flags & RTF_LLINFO) &&
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 491f66482c6..8cc6fc4e180 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.353 2021/03/07 06:02:32 dlg Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.354 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -2294,7 +2294,7 @@ carp_transmit(struct carp_softc *sc, struct ifnet *ifp0, struct mbuf *m)
/*
* Do not leak the multicast address when sending
- * advertisements in 'ip' and 'ip-stealth' balacing
+ * advertisements in 'ip' and 'ip-stealth' balancing
* modes.
*/
if (sc->sc_balancing == CARP_BAL_IP ||
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index faea78c6589..3c72c4459e3 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_id.c,v 1.24 2014/11/18 02:37:31 tedu Exp $ */
+/* $OpenBSD: ip_id.c,v 1.25 2021/03/10 10:21:48 jsg Exp $ */
/*
* Copyright (c) 2008 Theo de Raadt, Ryan McBride
@@ -36,7 +36,7 @@ u_int16_t ip_randomid(void);
/*
* Return a random IP id. Shuffle the new value we get into the previous half
* of the ip_shuffle ring (-32767 or swap with ourself), to avoid duplicates
- * occuring too quickly but also still be random.
+ * occurring too quickly but also still be random.
*
* 0 is a special IP ID -- don't return it.
*/
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index fca59d9f18a..0ec3f723be4 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_input.c,v 1.354 2021/01/15 15:18:12 bluhm Exp $ */
+/* $OpenBSD: ip_input.c,v 1.355 2021/03/10 10:21:48 jsg Exp $ */
/* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */
/*
@@ -580,7 +580,7 @@ ip_ours(struct mbuf **mp, int *offp, int nxt, int af)
*offp = hlen;
nxt = ip->ip_p;
- /* Check wheter we are already in a IPv4/IPv6 local deliver loop. */
+ /* Check whether we are already in a IPv4/IPv6 local deliver loop. */
if (af == AF_UNSPEC)
nxt = ip_deliver(mp, offp, nxt, AF_INET);
return nxt;
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index 6b52787c7aa..4d40e61a92d 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.c,v 1.237 2021/02/23 19:43:54 tobhe Exp $ */
+/* $OpenBSD: ip_ipsp.c,v 1.238 2021/03/10 10:21:49 jsg Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -682,7 +682,7 @@ puttdb(struct tdb *tdbp)
/*
* Rehash if this tdb would cause a bucket to have more than
* two items and if the number of tdbs exceed 10% of the
- * bucket count. This number is arbitratily chosen and is
+ * bucket count. This number is arbitrarily chosen and is
* just a measure to not keep rehashing when adding and
* removing tdbs which happens to always end up in the same
* bucket, which is not uncommon when doing manual keying.
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index 98000ccceff..5e2b5d07e32 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec_output.c,v 1.78 2020/09/22 19:20:21 tobhe Exp $ */
+/* $OpenBSD: ipsec_output.c,v 1.79 2021/03/10 10:21:49 jsg Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
@@ -323,7 +323,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready)
dstopt = 1;
} else if (nxt == IPPROTO_ROUTING) {
/*
- * if we see destionation option next
+ * if we see destination option next
* time, it must be dest2.
*/
dstopt = 2;
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index d0a02807520..58064906d08 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_input.c,v 1.366 2021/02/03 13:40:06 jan Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.367 2021/03/10 10:21:49 jsg Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
@@ -3180,7 +3180,7 @@ syn_cache_insert(struct syn_cache *sc, struct tcpcb *tp)
* If there are no entries in the hash table, reinitialize
* the hash secrets. To avoid useless cache swaps and
* reinitialization, use it until the limit is reached.
- * An emtpy cache is also the oportunity to resize the hash.
+ * An empty cache is also the opportunity to resize the hash.
*/
if (set->scs_count == 0 && set->scs_use <= 0) {
set->scs_use = tcp_syn_use_limit;
@@ -3393,7 +3393,7 @@ syn_cache_lookup(struct sockaddr *src, struct sockaddr *dst,
NET_ASSERT_LOCKED();
- /* Check the active cache first, the passive cache is likely emtpy. */
+ /* Check the active cache first, the passive cache is likely empty. */
sets[0] = &tcp_syn_cache[tcp_syn_cache_active];
sets[1] = &tcp_syn_cache[!tcp_syn_cache_active];
for (i = 0; i < 2; i++) {
@@ -3609,7 +3609,7 @@ syn_cache_get(struct sockaddr *src, struct sockaddr *dst, struct tcphdr *th,
tp->rcv_up = sc->sc_irs + 1;
/*
- * This is what whould have happened in tcp_output() when
+ * This is what would have happened in tcp_output() when
* the SYN,ACK was sent.
*/
tp->snd_up = tp->snd_una;
@@ -3834,7 +3834,7 @@ syn_cache_add(struct sockaddr *src, struct sockaddr *dst, struct tcphdr *th,
* With the default sbmax of 256K, a scale factor
* of 3 will be chosen by this algorithm. Those who
* choose a larger sbmax should watch out
- * for the compatiblity problems mentioned above.
+ * for the compatibility problems mentioned above.
*
* RFC1323: The Window field in a SYN (i.e., a <SYN>
* or <SYN,ACK>) segment itself is never scaled.
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index a9821a5f5f1..71408fb7a80 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_usrreq.c,v 1.179 2021/01/09 20:58:37 gnezdo Exp $ */
+/* $OpenBSD: tcp_usrreq.c,v 1.180 2021/03/10 10:21:49 jsg Exp $ */
/* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */
/*
@@ -1104,7 +1104,7 @@ tcp_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
/*
* Scale the send buffer so that inflight data is not accounted against
* the limit. The buffer will scale with the congestion window, if the
- * the receiver stops acking data the window will shrink and therefor
+ * the receiver stops acking data the window will shrink and therefore
* the buffer size will shrink as well.
* In low memory situation try to shrink the buffer to the initial size
* disabling the send buffer scaling as long as the situation persists.
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 378927ecfec..4016424f9c9 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.234 2021/01/11 13:28:53 bluhm Exp $ */
+/* $OpenBSD: icmp6.c,v 1.235 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -349,7 +349,7 @@ icmp6_do_error(struct mbuf *m, int type, int code, int param)
/*
* icmp6_reflect() is designed to be in the input path.
- * icmp6_error() can be called from both input and outut path,
+ * icmp6_error() can be called from both input and output path,
* and if we are in output path rcvif could contain bogus value.
* clear m->m_pkthdr.ph_ifidx for safety, we should have enough
* scope information in ip header (nip6).
@@ -362,7 +362,7 @@ icmp6_do_error(struct mbuf *m, int type, int code, int param)
freeit:
/*
- * If we can't tell wheter or not we can generate ICMP6, free it.
+ * If we can't tell whether or not we can generate ICMP6, free it.
*/
return (m_freem(m));
}
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index f26eed31bdd..1721aa191d7 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6.c,v 1.242 2020/08/07 18:09:16 florian Exp $ */
+/* $OpenBSD: in6.c,v 1.243 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */
/*
@@ -1033,7 +1033,7 @@ in6_addmulti(struct in6_addr *maddr6, struct ifnet *ifp, int *errorp)
IN6_LOOKUP_MULTI(*maddr6, ifp, in6m);
if (in6m != NULL) {
/*
- * Found it; just increment the refrence count.
+ * Found it; just increment the reference count.
*/
in6m->in6m_refcnt++;
} else {
@@ -1147,7 +1147,7 @@ in6_joingroup(struct ifnet *ifp, struct in6_addr *addr, int *errorp)
}
imm->i6mm_maddr = in6_addmulti(addr, ifp, errorp);
if (!imm->i6mm_maddr) {
- /* *errorp is alrady set */
+ /* *errorp is already set */
free(imm, M_IPMADDR, sizeof(*imm));
return NULL;
}
@@ -1580,7 +1580,7 @@ in6if_do_dad(struct ifnet *ifp)
/*
* Our DAD routine requires the interface up and running.
* However, some interfaces can be up before the RUNNING
- * status. Additionaly, users may try to assign addresses
+ * status. Additionally, users may try to assign addresses
* before the interface becomes up (or running).
* We simply skip DAD in such a case as a work around.
* XXX: we should rather mark "tentative" on such addresses,
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 310bf6c3fef..d87a3387693 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6.h,v 1.107 2020/08/24 16:40:07 gnezdo Exp $ */
+/* $OpenBSD: in6.h,v 1.108 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/*
@@ -327,7 +327,7 @@ struct route_in6 {
#define IPV6_HOPLIMIT 47 /* int; send hop limit */
#define IPV6_NEXTHOP 48 /* sockaddr; next hop addr */
#define IPV6_HOPOPTS 49 /* ip6_hbh; send hop-by-hop option */
-#define IPV6_DSTOPTS 50 /* ip6_dest; send dst option befor rthdr */
+#define IPV6_DSTOPTS 50 /* ip6_dest; send dst option before rthdr */
#define IPV6_RTHDR 51 /* ip6_rthdr; send routing header */
#define IPV6_AUTH_LEVEL 53 /* int; authentication used */
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 500feb6e4f1..07c90102b8f 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_src.c,v 1.84 2020/11/07 09:51:40 denis Exp $ */
+/* $OpenBSD: in6_src.c,v 1.85 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */
/*
@@ -89,7 +89,7 @@ int in6_selectif(struct sockaddr_in6 *, struct ip6_pktopts *,
/*
* Return an IPv6 address, which is the most appropriate for a given
* destination and pcb. We need the additional opt parameter because
- * the values set at pcb level can be overriden via cmsg.
+ * the values set at pcb level can be overridden via cmsg.
*/
int
in6_pcbselsrc(struct in6_addr **in6src, struct sockaddr_in6 *dstsock,
@@ -220,7 +220,7 @@ in6_pcbselsrc(struct in6_addr **in6src, struct sockaddr_in6 *dstsock,
/*
* Use preferred source address if :
* - destination is not onlink
- * - preferred source addresss is set
+ * - preferred source address is set
* - output interface is UP
*/
if (ro->ro_rt && !(ro->ro_rt->rt_flags & RTF_LLINFO) &&
@@ -525,7 +525,7 @@ in6_recoverscope(struct sockaddr_in6 *sin6, const struct in6_addr *in6)
}
/*
- * just clear the embedded scope identifer.
+ * just clear the embedded scope identifier.
*/
void
in6_clearscope(struct in6_addr *addr)
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 10c786d6aba..dd0b172c714 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_id.c,v 1.15 2021/03/01 11:05:43 bluhm Exp $ */
+/* $OpenBSD: ip6_id.c,v 1.16 2021/03/10 10:21:49 jsg Exp $ */
/* $NetBSD: ip6_id.c,v 1.7 2003/09/13 21:32:59 itojun Exp $ */
/* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */
@@ -93,7 +93,7 @@
struct randomtab {
const int ru_bits; /* resulting bits */
- const long ru_out; /* Time after wich will be reseeded */
+ const long ru_out; /* Time after which will be reseeded */
const u_int32_t ru_max; /* Uniq cycle, avoid blackjack prediction */
const u_int32_t ru_gen; /* Starting generator */
const u_int32_t ru_n; /* ru_n: prime, ru_n - 1: product of pfacts[] */
@@ -113,7 +113,7 @@ struct randomtab {
static struct randomtab randomtab_20 = {
20, /* resulting bits */
- 180, /* Time after wich will be reseeded */
+ 180, /* Time after which will be reseeded */
200000, /* Uniq cycle, avoid blackjack prediction */
2, /* Starting generator */
524269, /* RU_N-1 = 2^2*3^2*14563 */
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 46b49ee1a9b..cb50b32bdcc 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_input.c,v 1.231 2021/02/25 02:48:21 dlg Exp $ */
+/* $OpenBSD: ip6_input.c,v 1.232 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -531,7 +531,7 @@ ip6_ours(struct mbuf **mp, int *offp, int nxt, int af)
if (ip6_hbhchcheck(*mp, offp, &nxt, NULL))
return IPPROTO_DONE;
- /* Check wheter we are already in a IPv4/IPv6 local deliver loop. */
+ /* Check whether we are already in a IPv4/IPv6 local deliver loop. */
if (af == AF_UNSPEC)
nxt = ip_deliver(mp, offp, nxt, AF_INET6);
return nxt;
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 4f0e96dab69..047af4ef390 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_mroute.c,v 1.125 2020/06/24 22:03:44 cheloha Exp $ */
+/* $OpenBSD: ip6_mroute.c,v 1.126 2021/03/10 10:21:49 jsg Exp $ */
/* $NetBSD: ip6_mroute.c,v 1.59 2003/12/10 09:28:38 itojun Exp $ */
/* $KAME: ip6_mroute.c,v 1.45 2001/03/25 08:38:51 itojun Exp $ */
@@ -1137,7 +1137,7 @@ phyint_send6(struct ifnet *ifp, struct ip6_hdr *ip6, struct mbuf *m)
mb_copy->m_flags |= M_MCAST;
/*
- * If we sourced the packet, call ip6_output since we may devide
+ * If we sourced the packet, call ip6_output since we may divide
* the packet into fragments when the packet is too big for the
* outgoing interface.
* Otherwise, we can simply send the packet to the interface
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 3591f17b922..28ed1c4aef2 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.255 2021/03/01 11:05:43 bluhm Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.256 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -560,7 +560,7 @@ reroute:
}
/*
- * If this packet is going trough a loopback interface we wont
+ * If this packet is going through a loopback interface we won't
* be able to restore its scope ID using the interface index.
*/
if (IN6_IS_SCOPE_EMBED(&ip6->ip6_src)) {
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h
index ddbdbcb970d..af6e2f33757 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6protosw.h,v 1.13 2017/11/23 13:45:46 mpi Exp $ */
+/* $OpenBSD: ip6protosw.h,v 1.14 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -91,7 +91,7 @@ struct in6_addr;
*
* ip6c_finaldst usually points to ip6c_ip6->ip6_dst. if the original
* (internal) packet carries a routing header, it may point the final
- * dstination address in the routing header.
+ * destination address in the routing header.
*
* ip6c_src: ip6c_ip6->ip6_src + scope info + flowlabel in ip6c_ip6
* (beware of flowlabel, if you try to compare it against others)
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index d5df2132084..cbba92885cd 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp6_output.c,v 1.56 2018/09/13 19:53:58 bluhm Exp $ */
+/* $OpenBSD: udp6_output.c,v 1.57 2021/03/10 10:21:49 jsg Exp $ */
/* $KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $ */
/*
@@ -91,7 +91,7 @@
#include <netinet6/ip6protosw.h>
/*
- * UDP protocol inplementation.
+ * UDP protocol implementation.
* Per RFC 768, August, 1980.
*/
int
diff --git a/sys/netmpls/mpls.h b/sys/netmpls/mpls.h
index 36bea7c8eab..a1d4fee78d3 100644
--- a/sys/netmpls/mpls.h
+++ b/sys/netmpls/mpls.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls.h,v 1.44 2020/08/19 19:22:53 gnezdo Exp $ */
+/* $OpenBSD: mpls.h,v 1.45 2021/03/10 10:21:49 jsg Exp $ */
/*
* Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
@@ -69,7 +69,7 @@ struct shim_hdr {
#define MPLS_BOS_ISSET(l) (((l) & MPLS_BOS_MASK) == MPLS_BOS_MASK)
-/* Reserved lavel values (RFC3032) */
+/* Reserved label values (RFC3032) */
#define MPLS_LABEL_IPV4NULL 0 /* IPv4 Explicit NULL Label */
#define MPLS_LABEL_RTALERT 1 /* Router Alert Label */
#define MPLS_LABEL_IPV6NULL 2 /* IPv6 Explicit NULL Label */
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c
index c1be874461d..1265056a036 100644
--- a/sys/netmpls/mpls_input.c
+++ b/sys/netmpls/mpls_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_input.c,v 1.76 2020/01/24 05:14:52 jsg Exp $ */
+/* $OpenBSD: mpls_input.c,v 1.77 2021/03/10 10:21:49 jsg Exp $ */
/*
* Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -413,7 +413,7 @@ mpls_do_error(struct mbuf *m, int type, int code, int destmtu)
return (NULL);
ip = mtod(m, struct ip *);
- /* stuff to fix up which is normaly done in ip_output */
+ /* stuff to fix up which is normally done in ip_output */
ip->ip_v = IPVERSION;
ip->ip_id = htons(ip_randomid());
ip->ip_sum = 0;
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 7614cfa02b6..86eab567c61 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: domain.h,v 1.20 2019/06/13 08:12:11 claudio Exp $ */
+/* $OpenBSD: domain.h,v 1.21 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: domain.h,v 1.10 1996/02/09 18:25:07 christos Exp $ */
/*
@@ -59,7 +59,7 @@ struct domain {
/* initialize routing table */
unsigned int dom_sasize; /* size of sockaddr structure */
unsigned int dom_rtoffset; /* offset of the key, in bytes */
- unsigned int dom_maxplen; /* maxium prefix length, in bits */
+ unsigned int dom_maxplen; /* maximum prefix length, in bits */
void *(*dom_ifattach)(struct ifnet *);
void (*dom_ifdetach)(struct ifnet *, void *);
/* af-dependent data on ifnet */
diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h
index 9a1dec64cbd..86a2543c5ba 100644
--- a/sys/sys/exec_elf.h
+++ b/sys/sys/exec_elf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.h,v 1.88 2020/07/06 13:33:09 pirofti Exp $ */
+/* $OpenBSD: exec_elf.h,v 1.89 2021/03/10 10:21:47 jsg Exp $ */
/*
* Copyright (c) 1995, 1996 Erik Theisen. All rights reserved.
*
@@ -614,7 +614,7 @@ typedef struct {
* NT_OPENBSD_PROCINFO
* Note is a "elfcore_procinfo" structure.
* NT_OPENBSD_AUXV
- * Note is a a bunch of Auxilliary Vectors, terminated by
+ * Note is a a bunch of Auxiliary Vectors, terminated by
* an AT_NULL entry.
* NT_OPENBSD_REGS
* Note is a "reg" structure.
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index 78bd64dc4de..f500e552234 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ktrace.h,v 1.39 2020/09/14 07:15:25 mpi Exp $ */
+/* $OpenBSD: ktrace.h,v 1.40 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: ktrace.h,v 1.12 1996/02/04 02:12:29 christos Exp $ */
/*
@@ -147,7 +147,7 @@ struct ktr_user {
};
/*
- * KTR_EXECARGS and KTR_EXECENV - args and evironment records
+ * KTR_EXECARGS and KTR_EXECENV - args and environment records
*/
#define KTR_EXECARGS 10
#define KTR_EXECENV 11
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 8060c52bab2..6e619fe13c6 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.132 2021/02/06 21:26:19 deraadt Exp $ */
+/* $OpenBSD: param.h,v 1.133 2021/03/10 10:21:47 jsg Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -109,7 +109,7 @@
#define PRIMASK 0x0ff
#define PCATCH 0x100 /* OR'd with pri for tsleep to check signals */
-#define PNORELOCK 0x200 /* OR'd with pri for msleep to not reaquire
+#define PNORELOCK 0x200 /* OR'd with pri for msleep to not reacquire
the mutex */
#endif /* _KERNEL */
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index d46cbbed99f..4b65fe76a63 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: shm.h,v 1.29 2019/11/03 20:16:01 guenther Exp $ */
+/* $OpenBSD: shm.h,v 1.30 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: shm.h,v 1.20 1996/04/09 20:55:35 cgd Exp $ */
/*
@@ -85,7 +85,7 @@
#define SHM_UNLOCK 4 /* Unlock a segment locked by SHM_LOCK. */
/*
- * Segment low boundry address multiple
+ * Segment low boundary address multiple
*/
#define SHMLBA (1U << _MAX_PAGE_SHIFT)
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index acec065eea6..68c18cfdf8a 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.h,v 1.213 2020/12/28 18:28:11 mglocker Exp $ */
+/* $OpenBSD: sysctl.h,v 1.214 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */
/*
@@ -134,7 +134,7 @@ struct ctlname {
/* was KERN_RND 31 */
#define KERN_NOSUIDCOREDUMP 32 /* int: no setuid coredumps ever */
#define KERN_FSYNC 33 /* int: file synchronization support */
-#define KERN_SYSVMSG 34 /* int: SysV message queue suppoprt */
+#define KERN_SYSVMSG 34 /* int: SysV message queue support */
#define KERN_SYSVSEM 35 /* int: SysV semaphore support */
#define KERN_SYSVSHM 36 /* int: SysV shared memory support */
/* was KERN_ARND 37 */
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 0e85f400cec..4a2394d07f4 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wait.h,v 1.17 2014/06/13 22:40:31 matthew Exp $ */
+/* $OpenBSD: wait.h,v 1.18 2021/03/10 10:21:47 jsg Exp $ */
/* $NetBSD: wait.h,v 1.11 1996/04/09 20:55:51 cgd Exp $ */
/*
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
/*
- * This file holds definitions relevent to the wait4 system call
+ * This file holds definitions relevant to the wait4 system call
* and the alternate interfaces that use it (wait, wait3, waitpid).
*/