The branch main has been updated by tuexen:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e7e65008ffba90dc57c5f2edf5a000d7d1293a47

commit e7e65008ffba90dc57c5f2edf5a000d7d1293a47
Author:     Michael Tuexen <tue...@freebsd.org>
AuthorDate: 2022-03-29 19:09:51 +0000
Commit:     Michael Tuexen <tue...@freebsd.org>
CommitDate: 2022-03-29 19:09:51 +0000

    sctp: fix typos
    
    Thanks to David Sanders for fixing the typos in the userland stack.
    
    MFC after:      3 days
---
 sys/netinet/sctp_asconf.c       | 17 ++++++++++-------
 sys/netinet/sctp_bsd_addr.c     |  4 ++--
 sys/netinet/sctp_cc_functions.c |  2 +-
 sys/netinet/sctp_indata.c       | 29 +++++++++++++++--------------
 sys/netinet/sctp_input.c        | 20 ++++++++++----------
 sys/netinet/sctp_output.c       | 26 +++++++++++++-------------
 sys/netinet/sctp_ss_functions.c |  6 +++---
 sys/netinet/sctp_sysctl.c       |  4 ++--
 sys/netinet/sctp_sysctl.h       |  2 +-
 sys/netinet/sctp_timer.c        |  8 ++++----
 sys/netinet/sctp_usrreq.c       |  4 ++--
 sys/netinet/sctputil.c          | 24 ++++++++++++------------
 12 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 2250d084ca06..411440468856 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -1107,7 +1107,7 @@ sctp_path_check_and_react(struct sctp_tcb *stcb, struct 
sctp_ifa *newifa)
                return;
        }
 
-       /* Multiple local addresses exsist in the association.  */
+       /* Multiple local addresses exist in the association.  */
        TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) {
                /* clear any cached route and source address */
                RO_NHFREE(&net->ro);
@@ -1948,7 +1948,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct 
sctp_tcb *stcb,
 
                        sin6 = &ifa->address.sin6;
                        if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-                               /* we skip unspecifed addresses */
+                               /* we skip unspecified addresses */
                                return;
                        }
                        if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
@@ -1979,7 +1979,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct 
sctp_tcb *stcb,
 
                        sin = &ifa->address.sin;
                        if (sin->sin_addr.s_addr == 0) {
-                               /* we skip unspecifed addresses */
+                               /* we skip unspecified addresses */
                                return;
                        }
                        if (stcb->asoc.scope.ipv4_local_scope == 0 &&
@@ -2134,7 +2134,7 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct 
sctp_tcb *stcb,
                                }
                                sin6 = &ifa->address.sin6;
                                if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-                                       /* we skip unspecifed addresses */
+                                       /* we skip unspecified addresses */
                                        continue;
                                }
                                if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
@@ -2166,7 +2166,7 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct 
sctp_tcb *stcb,
 
                                sin = &ifa->address.sin;
                                if (sin->sin_addr.s_addr == 0) {
-                                       /* we skip unspecifed addresses */
+                                       /* we skip unspecified addresses */
                                        continue;
                                }
                                if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
@@ -2449,7 +2449,10 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int 
addr_locked)
 
                                        sin = &sctp_ifa->address.sin;
                                        if (sin->sin_addr.s_addr == 0) {
-                                               /* skip unspecifed addresses */
+                                               /*
+                                                * skip unspecified
+                                                * addresses
+                                                */
                                                continue;
                                        }
                                        if 
(prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
@@ -2485,7 +2488,7 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int 
addr_locked)
                                        sin6 = &sctp_ifa->address.sin6;
                                        if 
(IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                                                /*
-                                                * we skip unspecifed
+                                                * we skip unspecified
                                                 * addresses
                                                 */
                                                continue;
diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c
index 2a00885d8ddd..a36c360279ff 100644
--- a/sys/netinet/sctp_bsd_addr.c
+++ b/sys/netinet/sctp_bsd_addr.c
@@ -224,7 +224,7 @@ sctp_init_ifns_for_vrf(int vrfid)
 #ifdef INET6
                        case AF_INET6:
                                if (IN6_IS_ADDR_UNSPECIFIED(&((struct 
sockaddr_in6 *)ifa->ifa_addr)->sin6_addr)) {
-                                       /* skip unspecifed addresses */
+                                       /* skip unspecified addresses */
                                        continue;
                                }
                                break;
@@ -326,7 +326,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd)
        case AF_INET6:
                ifa_flags = ((struct in6_ifaddr *)ifa)->ia6_flags;
                if (IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 
*)ifa->ifa_addr)->sin6_addr)) {
-                       /* skip unspecifed addresses */
+                       /* skip unspecified addresses */
                        return;
                }
                break;
diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c
index 81b9e28f9959..c5b031199a01 100644
--- a/sys/netinet/sctp_cc_functions.c
+++ b/sys/netinet/sctp_cc_functions.c
@@ -1323,7 +1323,7 @@ sctp_cwnd_prepare_rtcc_net_for_sack(struct sctp_tcb *stcb 
SCTP_UNUSED,
     struct sctp_nets *net)
 {
        if (net->cc_mod.rtcc.tls_needs_set > 0) {
-               /* We had a bw measurment going on */
+               /* We had a bw measurement going on */
                struct timeval ltls;
 
                SCTP_GETPTIME_TIMEVAL(&ltls);
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index fb1327a94475..e988010340f6 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -497,7 +497,7 @@ sctp_queue_data_to_stream(struct sctp_tcb *stcb,
         * ssn 2 with TSN 1? If the peer is doing some sort of funky TSN/SSN
         * assignment this could happen... and I don't see how this would be
         * a violation. So for now I am undecided an will leave the sort by
-        * SSN alone. Maybe a hybred approach is the answer
+        * SSN alone. Maybe a hybrid approach is the answer
         *
         */
        struct sctp_queued_to_read *at;
@@ -962,10 +962,11 @@ sctp_inject_old_unordered_data(struct sctp_tcb *stcb,
                                 * (since the equals part is a TSN failure
                                 * it must be that).
                                 *
-                                * We are completly hosed in that case since
-                                * I have no way to recover. This really
-                                * will only happen if we can get more TSN's
-                                * higher before the pd-api-point.
+                                * We are completely hosed in that case
+                                * since I have no way to recover. This
+                                * really will only happen if we can get
+                                * more TSN's higher before the
+                                * pd-api-point.
                                 */
                                sctp_abort_in_reasm(stcb, control, chk,
                                    abort_flag,
@@ -3382,7 +3383,7 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct 
sctp_association *asoc,
                 */
                if (tp1->whoTo && tp1->whoTo->saw_newack == 0) {
                        /*
-                        * No new acks were receieved for data sent to this
+                        * No new acks were received for data sent to this
                         * dest. Therefore, according to the SFR algo for
                         * CMT, no data sent to this dest can be marked for
                         * FR using this SACK.
@@ -3393,12 +3394,12 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, 
struct sctp_association *asoc,
                            tp1->whoTo->this_sack_highest_newack) &&
                    !(accum_moved && asoc->fast_retran_loss_recovery)) {
                        /*
-                        * CMT: New acks were receieved for data sent to
-                        * this dest. But no new acks were seen for data
-                        * sent after tp1. Therefore, according to the SFR
-                        * algo for CMT, tp1 cannot be marked for FR using
-                        * this SACK. This step covers part of the DAC algo
-                        * and the HTNA algo as well.
+                        * CMT: New acks were received for data sent to this
+                        * dest. But no new acks were seen for data sent
+                        * after tp1. Therefore, according to the SFR algo
+                        * for CMT, tp1 cannot be marked for FR using this
+                        * SACK. This step covers part of the DAC algo and
+                        * the HTNA algo as well.
                         */
                        continue;
                }
@@ -4430,7 +4431,7 @@ sctp_handle_sack(struct mbuf *m, int offset_seg, int 
offset_dup,
         * old sack, if so discard. 2) If there is nothing left in the send
         * queue (cum-ack is equal to last acked) then you have a duplicate
         * too, update any rwnd change and verify no timers are running.
-        * then return. 3) Process any new consequtive data i.e. cum-ack
+        * then return. 3) Process any new consecutive data i.e. cum-ack
         * moved process these first and note that it moved. 4) Process any
         * sack blocks. 5) Drop any acked from the queue. 6) Check for any
         * revoked blocks and mark. 7) Update the cwnd. 8) Nothing left,
@@ -4567,7 +4568,7 @@ hopeless_peer:
         * We init netAckSz and netAckSz2 to 0. These are used to track 2
         * things. The total byte count acked is tracked in netAckSz AND
         * netAck2 is used to track the total bytes acked that are un-
-        * amibguious and were never retransmitted. We track these on a per
+        * ambiguous and were never retransmitted. We track these on a per
         * destination address basis.
         */
        TAILQ_FOREACH(net, &asoc->nets, sctp_next) {
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 91f55af7f598..53e3de222ad5 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -1596,14 +1596,14 @@ sctp_process_cookie_existing(struct mbuf *m, int 
iphlen, int offset,
                         * random number generator returned the same vtag
                         * when we first sent our INIT-ACK and when we later
                         * sent our INIT. The side with the seq numbers that
-                        * are different will be the one that normnally
-                        * would have hit case C. This in effect "extends"
-                        * our vtags in this collision case to be 64 bits.
-                        * The same collision could occur aka you get both
-                        * vtag and seq number the same twice in a row.. but
-                        * is much less likely. If it did happen then we
-                        * would proceed through and bring up the assoc.. we
-                        * may end up with the wrong stream setup however..
+                        * are different will be the one that normally would
+                        * have hit case C. This in effect "extends" our
+                        * vtags in this collision case to be 64 bits. The
+                        * same collision could occur aka you get both vtag
+                        * and seq number the same twice in a row.. but is
+                        * much less likely. If it did happen then we would
+                        * proceed through and bring up the assoc.. we may
+                        * end up with the wrong stream setup however..
                         * which would be bad.. but there is no way to
                         * tell.. until we send on a stream that does not
                         * exist :-)
@@ -2020,7 +2020,7 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int 
offset,
 
        /*
         * now that we know the INIT/INIT-ACK are in place, create a new TCB
-        * and popluate
+        * and populate
         */
 
        /*
@@ -4125,7 +4125,7 @@ strres_nochunk:
  * Handle a router or endpoints report of a packet loss, there are two ways
  * to handle this, either we get the whole packet and must disect it
  * ourselves (possibly with truncation and or corruption) or it is a summary
- * from a middle box that did the disectting for us.
+ * from a middle box that did the disecting for us.
  */
 static void
 sctp_handle_packet_dropped(struct sctp_pktdrop_chunk *cp,
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 698025477c69..7aa6c433b684 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -1914,7 +1914,7 @@ sctp_is_address_in_scope(struct sctp_ifa *ifa,
                        /* ok to use deprecated addresses? */
                        sin6 = &ifa->address.sin6;
                        if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-                               /* skip unspecifed addresses */
+                               /* skip unspecified addresses */
                                return (0);
                        }
                        if (    /* (local_scope == 0) && */
@@ -3317,7 +3317,7 @@ sctp_source_address_selection(struct sctp_inpcb *inp,
         *   have the best source.
         * - If not we must rotate amongst the addresses.
         *
-        * Cavets and issues
+        * Caveats and issues
         *
         * Do we need to pay attention to scope. We can have a private address
         * or a global address we are sourcing or sending to. So if we draw
@@ -6967,7 +6967,7 @@ sctp_clean_up_datalist(struct sctp_tcb *stcb,
                if (i > 0) {
                        /*
                         * Any chunk NOT 0 you zap the time chunk 0 gets
-                        * zapped or set based on if a RTO measurment is
+                        * zapped or set based on if a RTO measurement is
                         * needed.
                         */
                        data_list[i]->do_rtt = 0;
@@ -7125,7 +7125,7 @@ sctp_can_we_split_this(struct sctp_tcb *stcb, uint32_t 
length,
        }
        if ((length <= space_left) ||
            ((length - space_left) < SCTP_BASE_SYSCTL(sctp_min_residual))) {
-               /* Sub-optimial residual don't split in non-eeor mode. */
+               /* Sub-optimal residual don't split in non-eeor mode. */
                return (0);
        }
        /*
@@ -7359,7 +7359,7 @@ dont_do_it:
                                 * than the sp->length.
                                 */
 #ifdef INVARIANTS
-                               panic("Huh, freing tail? - TSNH");
+                               panic("Huh, freeing tail? - TSNH");
 #else
                                SCTP_PRINTF("Huh, freeing tail? - TSNH\n");
                                sp->tail_mbuf = sp->data = NULL;
@@ -7742,10 +7742,10 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
         * - Service the stream queue that is next, moving any
         *   message (note I must get a complete message i.e. FIRST/MIDDLE and
         *   LAST to the out queue in one pass) and assigning TSN's. This
-        *   only applys though if the peer does not support NDATA. For NDATA
+        *   only applies though if the peer does not support NDATA. For NDATA
         *   chunks its ok to not send the entire message ;-)
         * - Check to see if the cwnd/rwnd allows any output, if so we go ahead 
and
-        *   fomulate and send the low level chunks. Making sure to combine
+        *   formulate and send the low level chunks. Making sure to combine
         *   any control in the control chunk queue also.
         */
        struct sctp_nets *net, *start_at, *sack_goes_to = NULL, *old_start_at = 
NULL;
@@ -7941,7 +7941,7 @@ again_one_more_time:
                /* how much can we send? */
                /* SCTPDBG("Examine for sending net:%x\n", (uint32_t)net); */
                if (old_start_at && (old_start_at == net)) {
-                       /* through list ocmpletely. */
+                       /* through list completely. */
                        break;
                }
                tsns_sent = 0xa;
@@ -8639,7 +8639,7 @@ again_one_more_time:
                                                SCTP_LTRACE_ERR_RET(inp, stcb, 
NULL, SCTP_FROM_SCTP_OUTPUT, ENOMEM);
                                                return (ENOMEM);
                                        }
-                                       /* upate our MTU size */
+                                       /* update our MTU size */
                                        /* Do clear IP_DF ? */
                                        if (chk->flags & 
CHUNK_FLAGS_FRAGMENT_OK) {
                                                no_fragmentflg = 0;
@@ -9630,7 +9630,7 @@ one_chunk_around:
                        if (chk->flags & CHUNK_FLAGS_FRAGMENT_OK) {
                                no_fragmentflg = 0;
                        }
-                       /* upate our MTU size */
+                       /* update our MTU size */
                        if (mtu > (chk->send_size + dmtu))
                                mtu -= (chk->send_size + dmtu);
                        else
@@ -9690,7 +9690,7 @@ one_chunk_around:
                                        if (fwd->flags & 
CHUNK_FLAGS_FRAGMENT_OK) {
                                                no_fragmentflg = 0;
                                        }
-                                       /* upate our MTU size */
+                                       /* update our MTU size */
                                        if (mtu > (fwd->send_size + dmtu))
                                                mtu -= (fwd->send_size + dmtu);
                                        else
@@ -9905,7 +9905,7 @@ sctp_chunk_output(struct sctp_inpcb *inp,
         *   FIRST/MIDDLE and LAST to the out queue in one pass) and assigning
         *   TSN's
         * - Check to see if the cwnd/rwnd allows any output, if so we
-        *   go ahead and fomulate and send the low level chunks. Making sure
+        *   go ahead and formulate and send the low level chunks. Making sure
         *   to combine any control in the control chunk queue also.
         */
        struct sctp_association *asoc;
@@ -9960,7 +9960,7 @@ do_it_again:
                 */
                if (from_where == SCTP_OUTPUT_FROM_COOKIE_ACK) {
                        /*-
-                        * Special hook for handling cookiess discarded
+                        * Special hook for handling cookies discarded
                         * by peer that carried data. Send cookie-ack only
                         * and then the next call with get the retran's.
                         */
diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c
index 793e936a3636..049c93767125 100644
--- a/sys/netinet/sctp_ss_functions.c
+++ b/sys/netinet/sctp_ss_functions.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 
 /*
  * Default simple round-robin algorithm.
- * Just interates the streams in the order they appear.
+ * Just iterates the streams in the order they appear.
  */
 
 static void
@@ -299,7 +299,7 @@ sctp_ss_default_is_user_msgs_incomplete(struct sctp_tcb 
*stcb SCTP_UNUSED, struc
 
 /*
  * Real round-robin algorithm.
- * Always interates the streams in ascending order.
+ * Always iterates the streams in ascending order.
  */
 static void
 sctp_ss_rr_add(struct sctp_tcb *stcb, struct sctp_association *asoc,
@@ -331,7 +331,7 @@ sctp_ss_rr_add(struct sctp_tcb *stcb, struct 
sctp_association *asoc,
 
 /*
  * Real round-robin per packet algorithm.
- * Always interates the streams in ascending order and
+ * Always iterates the streams in ascending order and
  * only fills messages of the same stream in a packet.
  */
 static struct sctp_stream_out *
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 66d42497832d..cc0be9ba36f4 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -143,7 +143,7 @@ sctp_sysctl_number_of_addresses(struct sctp_inpcb *inp)
        struct sctp_laddr *laddr;
 
        cnt = 0;
-       /* neither Mac OS X nor FreeBSD support mulitple routing functions */
+       /* neither Mac OS X nor FreeBSD support multiple routing functions */
        if ((vrf = sctp_find_vrf(inp->def_vrf_id)) == NULL) {
                return (0);
        }
@@ -223,7 +223,7 @@ sctp_sysctl_copy_out_local_addresses(struct sctp_inpcb 
*inp, struct sctp_tcb *st
                }
        }
 
-       /* neither Mac OS X nor FreeBSD support mulitple routing functions */
+       /* neither Mac OS X nor FreeBSD support multiple routing functions */
        if ((vrf = sctp_find_vrf(inp->def_vrf_id)) == NULL) {
                SCTP_INP_RUNLOCK(inp);
                SCTP_INP_INFO_RUNLOCK();
diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 0f76721058bc..695cd743403b 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -144,7 +144,7 @@ struct sctp_sysctl {
 #define SCTPCTL_AUTOASCONF_DEFAULT     1
 
 /* autoasconf: Enable SCTP Auto-ASCONF */
-#define SCTPCTL_MULTIPLEASCONFS_DESC   "Enable SCTP Muliple-ASCONFs"
+#define SCTPCTL_MULTIPLEASCONFS_DESC   "Enable SCTP Multiple-ASCONFs"
 #define SCTPCTL_MULTIPLEASCONFS_MIN    0
 #define SCTPCTL_MULTIPLEASCONFS_MAX    1
 #define SCTPCTL_MULTIPLEASCONFS_DEFAULT        SCTP_DEFAULT_MULTIPLE_ASCONFS
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index dee25676eead..90a647e94b6a 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -188,7 +188,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb,
         * JRS 5/14/07 - If mode is set to 2, use the CMT PF find alternate
         * net algorithm. This algorithm chooses the active destination (not
         * in PF state) with the largest cwnd value. If all destinations are
-        * in PF state, unreachable, or unconfirmed, choose the desination
+        * in PF state, unreachable, or unconfirmed, choose the destination
         * that is in PF state with the lowest error count. In case of a
         * tie, choose the destination that was most recently active.
         */
@@ -938,7 +938,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
 
                /*
                 * Get the address that failed, to force a new src address
-                * selecton and a route allocation.
+                * selection and a route allocation.
                 */
                if (net->ro._s_addr) {
                        sctp_free_ifa(net->ro._s_addr);
@@ -1446,8 +1446,8 @@ sctp_heartbeat_timer(struct sctp_inpcb *inp, struct 
sctp_tcb *stcb,
        if (!(net->dest_state & SCTP_ADDR_NOHB) &&
            !((net_was_pf == 0) && (net->dest_state & SCTP_ADDR_PF))) {
                /*
-                * when move to PF during threshold mangement, a HB has been
-                * queued in that routine
+                * when move to PF during threshold management, a HB has
+                * been queued in that routine
                 */
                uint32_t ms_gone_by;
 
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 15c30fe74904..87fef518b9e8 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -1106,7 +1106,7 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
                                                if (sin->sin_addr.s_addr == 0) {
                                                        /*
                                                         * we skip
-                                                        * unspecifed
+                                                        * unspecified
                                                         * addresses
                                                         */
                                                        continue;
@@ -1154,7 +1154,7 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
                                                if 
(IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                                                        /*
                                                         * we skip
-                                                        * unspecifed
+                                                        * unspecified
                                                         * addresses
                                                         */
                                                        continue;
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 684bc68940b4..e0ac9e23fc68 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -1200,7 +1200,7 @@ sctp_init_asoc(struct sctp_inpcb *inp, struct sctp_tcb 
*stcb,
        asoc->str_reset_seq_out = asoc->init_seq_number;
        asoc->sending_seq = asoc->init_seq_number;
        asoc->asconf_seq_out_acked = asoc->init_seq_number - 1;
-       /* we are optimisitic here */
+       /* we are optimistic here */
        asoc->peer_supports_nat = 0;
        asoc->sent_queue_retran_cnt = 0;
 
@@ -2233,7 +2233,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, 
struct sctp_tcb *stcb,
        case SCTP_TIMER_TYPE_RECV:
                /*
                 * Here we use the Delayed-Ack timer value from the inp,
-                * ususually about 200ms.
+                * usually about 200ms.
                 */
                if ((inp == NULL) || (stcb == NULL) || (net != NULL)) {
 #ifdef INVARIANTS
@@ -2337,7 +2337,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, 
struct sctp_tcb *stcb,
                break;
        case SCTP_TIMER_TYPE_NEWCOOKIE:
                /*
-                * Nothing needed but the endpoint here ususually about 60
+                * Nothing needed but the endpoint here usually about 60
                 * minutes.
                 */
                if ((inp == NULL) || (stcb != NULL) || (net != NULL)) {
@@ -2353,8 +2353,8 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, 
struct sctp_tcb *stcb,
                break;
        case SCTP_TIMER_TYPE_PATHMTURAISE:
                /*
-                * Here we use the value found in the EP for PMTUD,
-                * ususually about 10 minutes.
+                * Here we use the value found in the EP for PMTUD, usually
+                * about 10 minutes.
                 */
                if ((inp == NULL) || (stcb == NULL) || (net == NULL)) {
 #ifdef INVARIANTS
@@ -2468,7 +2468,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, 
struct sctp_tcb *stcb,
                break;
        case SCTP_TIMER_TYPE_INPKILL:
                /*
-                * The inp is setup to die. We re-use the signature_chage
+                * The inp is setup to die. We re-use the signature_change
                 * timer since that has stopped and we are in the GONE
                 * state.
                 */
@@ -2774,7 +2774,7 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, 
struct sctp_tcb *stcb,
                break;
        case SCTP_TIMER_TYPE_INPKILL:
                /*
-                * The inp is setup to die. We re-use the signature_chage
+                * The inp is setup to die. We re-use the signature_change
                 * timer since that has stopped and we are in the GONE
                 * state.
                 */
@@ -2992,7 +2992,7 @@ sctp_calculate_rto(struct sctp_tcb *stcb,
                        rto_logging(net, SCTP_LOG_RTTVAR);
                }
        } else {
-               /* First RTO measurment */
+               /* First RTO measurement */
                net->RTO_measured = 1;
                first_measure = 1;
                net->lastsa = rtt << SCTP_RTT_SHIFT;
@@ -5701,7 +5701,7 @@ restart_nosblocks:
                } else {
                        /* remove it */
                        TAILQ_REMOVE(&inp->read_queue, control, next);
-                       /* Add back any hiddend data */
+                       /* Add back any hidden data */
                        sctp_free_remote_addr(control->whoFrom);
                        sctp_free_a_readq(stcb, control);
                }
@@ -5781,7 +5781,7 @@ restart_nosblocks:
                                         * have the strm interleave feature 
present. Then if we have
                                         * taken some (pdapi) or we can refer 
to tht tcb AND we have
                                         * not started a delivery for this 
stream, we can take it.
-                                        * Note we do NOT allow a notificaiton 
on the same assoc to
+                                        * Note we do NOT allow a notification 
on the same assoc to
                                         * be delivered.
                                         */
                                        control = ctl;
@@ -6138,7 +6138,7 @@ get_more_data:
 #ifdef INVARIANTS
                                        panic("control->data not null at read 
eor?");
 #else
-                                       SCTP_PRINTF("Strange, data left in the 
control buffer .. invarients would panic?\n");
+                                       SCTP_PRINTF("Strange, data left in the 
control buffer .. invariants would panic?\n");
                                        sctp_m_freem(control->data);
                                        control->data = NULL;
 #endif
@@ -6149,7 +6149,7 @@ get_more_data:
                                        hold_rlock = 1;
                                }
                                TAILQ_REMOVE(&inp->read_queue, control, next);
-                               /* Add back any hiddend data */
+                               /* Add back any hidden data */
                                if (control->held_length) {
                                        held_length = 0;
                                        control->held_length = 0;

Reply via email to