git: e5f0a16e19bf - stable/13 - extra_tcp_stacks: Fix a few common typos

The branch stable/13 has been updated by gbe (doc committer):

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

commit e5f0a16e19bfeb2edb036743cc8d9af65b96a60d
Author:     Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2022-01-26 09:35:17 +0000
Commit:     Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2022-02-02 08:49:31 +0000

    extra_tcp_stacks: Fix a few common typos
    
    TCP_BBR:
    - Fix a typo introducted in 1b90dfa5d2b0, which was reported by tuexen@
    
    TCP_RACK:
    - Correct two sysctl descriptions: s/corret/correct/
    
    tcp_bbr(4): Also fix s/measurment/measurement/ in the man page
    
    (cherry picked from commit b3df222eaed5ae815695f13a4709ec5463ee8cab)
---
 share/man/man4/tcp_bbr.4      | 2 +-
 sys/netinet/tcp_stacks/bbr.c  | 6 +++---
 sys/netinet/tcp_stacks/rack.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/share/man/man4/tcp_bbr.4 b/share/man/man4/tcp_bbr.4
index ea7e436b6c59..604e205820fb 100644
--- a/share/man/man4/tcp_bbr.4
+++ b/share/man/man4/tcp_bbr.4
@@ -64,7 +64,7 @@ branch of the
 MIB:
 .Bl -tag -width ".Va exp_backoff_scale"
 .It Va cwnd
-Cwnd controls, for example "target cwnd rtt measurment" and "BBR initial window".
+Cwnd controls, for example "target cwnd rtt measurement" and "BBR initial window".
 .It Va measure
 Measurement controls.
 .It Va pacing
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index ea0b4d44bee7..e3b7f24c6863 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -191,7 +191,7 @@ static int32_t bbr_hptsi_max_div = 2;	/* time, 0 means turned off. We need this
 static int32_t bbr_policer_call_from_rack_to = 0;
 static int32_t bbr_policer_detection_enabled = 1;
 static int32_t bbr_min_measurements_req = 1;	/* We need at least 2
-						 * measurement before we are
+						 * measurements before we are
 						 * "good" note that 2 == 1.
 						 * This is because we use a >
 						 * comparison. This means if
@@ -6462,7 +6462,7 @@ tcp_bbr_commit_bw(struct tcp_bbr *bbr, uint32_t cts)
 	uint64_t orig_bw;
 
 	if (bbr->r_ctl.rc_bbr_cur_del_rate == 0) {
-		/* We never apply a zero measurment */
+		/* We never apply a zero measurement */
 		bbr_log_type_bbrupd(bbr, 20, cts, 0, 0,
 				    0, 0, 0, 0, 0, 0);
 		return;
@@ -11059,7 +11059,7 @@ bbr_state_startup(struct tcp_bbr *bbr, uint32_t cts, int32_t epoch, int32_t pkt_
 	    (bbr->r_ctl.rc_lost_at_startup == bbr->r_ctl.rc_lost) &&
 	    (!IN_RECOVERY(bbr->rc_tp->t_flags))) {
 		/*
-		 * We only assess if we have a new measurment when
+		 * We only assess if we have a new measurement when
 		 * we have no loss and are not in recovery.
 		 * Drag up by one our last_startup epoch so we will hold
 		 * the number of non-gain we have already accumulated.
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index 8b9b62fb51d8..d2f8a13c4227 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -1875,12 +1875,12 @@ rack_init_sysctls(void)
 	SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx,
 	    SYSCTL_CHILDREN(rack_counters),
 	    OID_AUTO, "sndptr_wrong", CTLFLAG_RD,
-	    &rack_sbsndptr_wrong, "Total number of times the saved sbsndptr was incorret");
+	    &rack_sbsndptr_wrong, "Total number of times the saved sbsndptr was incorrect");
 	rack_sbsndptr_right = counter_u64_alloc(M_WAITOK);
 	SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx,
 	    SYSCTL_CHILDREN(rack_counters),
 	    OID_AUTO, "sndptr_right", CTLFLAG_RD,
-	    &rack_sbsndptr_right, "Total number of times the saved sbsndptr was corret");
+	    &rack_sbsndptr_right, "Total number of times the saved sbsndptr was correct");
 
 	COUNTER_ARRAY_ALLOC(rack_out_size, TCP_MSS_ACCT_SIZE, M_WAITOK);
 	SYSCTL_ADD_COUNTER_U64_ARRAY(&rack_sysctl_ctx, SYSCTL_CHILDREN(rack_sysctl_root),
@@ -4357,7 +4357,7 @@ rack_do_goodput_measurement(struct tcpcb *tp, struct tcp_rack *rack,
 	}
 	/* We store gp for b/w in bytes per second */
 	if (rack->rc_gp_filled == 0) {
-		/* Initial measurment */
+		/* Initial measurement */
 		if (bytes_ps) {
 			rack->r_ctl.gp_bw = bytes_ps;
 			rack->rc_gp_filled = 1;
@@ -4480,7 +4480,7 @@ rack_do_goodput_measurement(struct tcpcb *tp, struct tcp_rack *rack,
 				/*
 				 * The scaled measurement was long
 				 * enough so lets just add in the
-				 * portion of the measurment i.e. 1/rack_wma_divisor
+				 * portion of the measurement i.e. 1/rack_wma_divisor
 				 */
 				subpart = rack->r_ctl.gp_bw / rack_wma_divisor;
 				addpart = bytes_ps / rack_wma_divisor;