summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/netinet6/nd6.c22
-rw-r--r--sys/netinet6/nd6_nbr.c4
-rw-r--r--sys/netinet6/nd6_rtr.c6
3 files changed, 16 insertions, 16 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 59e3af798b9..ddc5fc1ea7f 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6.c,v 1.70 2006/02/21 10:23:25 markus Exp $ */
+/* $OpenBSD: nd6.c,v 1.71 2006/06/16 15:41:19 pascoe Exp $ */
/* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */
/*
@@ -536,7 +536,7 @@ nd6_timer(ignored_arg)
/*
* expire interface addresses.
* in the past the loop was inside prefix expiry processing.
- * However, from a stricter speci-confrmance standpoint, we should
+ * However, from a stricter spec-conformance standpoint, we should
* rather separate address lifetimes and prefix lifetimes.
*/
for (ia6 = in6_ifaddr; ia6; ia6 = nia6) {
@@ -889,7 +889,7 @@ nd6_free(rt, gc)
if (dr) {
/*
- * Unreachablity of a router might affect the default
+ * Unreachability of a router might affect the default
* router selection and on-link detection of advertised
* prefixes.
*/
@@ -941,7 +941,7 @@ nd6_free(rt, gc)
/*
* Upper-layer reachability hint for Neighbor Unreachability Detection.
*
- * XXX cost-effective metods?
+ * XXX cost-effective methods?
*/
void
nd6_nud_hint(rt, dst6, force)
@@ -1067,7 +1067,7 @@ nd6_rtrequest(req, rt, info)
break;
}
/*
- * In IPv4 code, we try to annonuce new RTF_ANNOUNCE entry here.
+ * In IPv4 code, we try to announce new RTF_ANNOUNCE entry here.
* We don't do that here since llinfo is not ready yet.
*
* There are also couple of other things to be discussed:
@@ -1295,8 +1295,8 @@ nd6_ioctl(cmd, data, ifp)
* in6_prlist is used for nd6_sysctl() - fill_prlist().
*/
/*
- * XXX meaning of fields, especialy "raflags", is very
- * differnet between RA prefix list and RR/static prefix list.
+ * XXX meaning of fields, especially "raflags", is very
+ * different between RA prefix list and RR/static prefix list.
* how about separating ioctls into two?
*/
bzero(oprl, sizeof(*oprl));
@@ -1488,7 +1488,7 @@ nd6_cache_lladdr(ifp, from, lladdr, lladdrlen, type, code)
* Validation about ifp->if_addrlen and lladdrlen must be done in
* the caller.
*
- * XXX If the link does not have link-layer adderss, what should
+ * XXX If the link does not have link-layer address, what should
* we do? (ifp->if_addrlen == 0)
* Spec says nothing in sections for RA, RS and NA. There's small
* description on it in NS section (RFC 2461 7.2.3).
@@ -1580,7 +1580,7 @@ fail:
if (ln->ln_state == ND6_LLINFO_STALE) {
/*
* XXX: since nd6_output() below will cause
- * state tansition to DELAY and reset the timer,
+ * state transition to DELAY and reset the timer,
* we must set the timer now, although it is actually
* meaningless.
*/
@@ -1614,7 +1614,7 @@ fail:
* - If lladdr exist, set IsRouter. This means (1-5).
* - If it is old entry (!newentry), set IsRouter. This means (7).
* So, based on the spec, in (1-5) and (7) cases we must set IsRouter.
- * A quetion arises for (1) case. (1) case has no lladdr in the
+ * A question arises for (1) case. (1) case has no lladdr in the
* neighbor cache, this is similar to (6).
* This case is rare but we figured that we MUST NOT set IsRouter.
*
@@ -1740,7 +1740,7 @@ nd6_output(ifp, origifp, m0, dst, rt0)
goto sendpkt;
/*
- * next hop determination. This routine is derived from ether_outpout.
+ * next hop determination. This routine is derived from ether_output.
*/
if (rt) {
if ((rt->rt_flags & RTF_UP) == 0) {
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 51d7d509907..9cfc5c9290d 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6_nbr.c,v 1.39 2006/03/05 21:48:57 miod Exp $ */
+/* $OpenBSD: nd6_nbr.c,v 1.40 2006/06/16 15:41:19 pascoe Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -272,7 +272,7 @@ nd6_ns_input(m, off, icmp6len)
* If source address is unspecified address, it is for
* duplicated address detection.
*
- * If not, the packet is for addess resolution;
+ * If not, the packet is for address resolution;
* silently ignore it.
*/
if (IN6_IS_ADDR_UNSPECIFIED(&saddr6))
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index e0322c637c1..7c41977d47b 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6_rtr.c,v 1.38 2006/04/22 19:43:07 claudio Exp $ */
+/* $OpenBSD: nd6_rtr.c,v 1.39 2006/06/16 15:41:19 pascoe Exp $ */
/* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */
/*
@@ -797,7 +797,7 @@ insert:
/*
* Insert the new router in the Default Router List;
* The Default Router List should be in the descending order
- * of router-preferece. Routers with the same preference are
+ * of router-preference. Routers with the same preference are
* sorted in the arriving time order.
*/
@@ -894,7 +894,7 @@ nd6_prelist_add(pr, dr, newp)
if (newp != NULL)
*newp = new;
- /* initilization */
+ /* initialization */
LIST_INIT(&new->ndpr_advrtrs);
in6_prefixlen2mask(&new->ndpr_mask, new->ndpr_plen);
/* make prefix in the canonical form */