From nobody Wed Feb 02 08:49:43 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3A7EF19ACB1F; Wed, 2 Feb 2022 08:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jpb8S0fGxz4tMC; Wed, 2 Feb 2022 08:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643791784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XOBkzrFJSXvc7+vi6Vv5UevDzzp/tMYfB9+OCYzD3Tk=; b=Jt/CFtLAdkeyyhWozoYiIn+UttcLu09NZXf0A4ADw6KPiPYcqQ6h380Gl27m9McNbXrzVE HmHqJdGmXdPOPTQRs4ysOfHkmQ2IWvHS1j3JnIZBKUpBVsdqiHIHpvwNJZQxG43hjPlwBR SPAnHuX5tSE3VX4ht2Xm9EaIbbLkexOOBFmdvhx23mF1nxXrFHjESSaNdcVOrLQPP01pkt /aOzpO2HbatANI6pvefQ3K2PADCL/wLqGuXAddfmZD0wxhjIZp9mvFdW3FOSOsMYtHu1Tp z3oVcEh+z41n412VvQywprRHFWMLRTENhDg1SBs82fhJ/roeVAJMc5QUDDhPDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D54D0214A8; Wed, 2 Feb 2022 08:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2128nhBE042887; Wed, 2 Feb 2022 08:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2128nhlZ042886; Wed, 2 Feb 2022 08:49:43 GMT (envelope-from git) Date: Wed, 2 Feb 2022 08:49:43 GMT Message-Id: <202202020849.2128nhlZ042886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e5f0a16e19bf - stable/13 - extra_tcp_stacks: Fix a few common typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e5f0a16e19bfeb2edb036743cc8d9af65b96a60d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643791784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XOBkzrFJSXvc7+vi6Vv5UevDzzp/tMYfB9+OCYzD3Tk=; b=JAaG2Le2BrEag50IrLpmS1oWJsgdjdIsjZroED7+2uG7s36WL+rBXVLjSQbhJ7Wd5lRPQA oeDjpPQBhxRBwN5zHgG/ZJv+i3c1oCZiQyTnEv0ENNPiMd6feOOHcp6jIbF8wYltT0qRVa 5Otms42GJ3GrPdyUQWjJxp2LYVNDZyEsOLZ2qmBLa56zuJGoQZhMTZ7XLQ+WeVlYnNX3oD a90wS5CTjraW9t2YlqPeav1Zjarcr2aBvA9UsJXxtA1HZ3eaoeyPSn6RSBoBPVsUVBFZMc axRlYCI/0t97c5mtwBFR/NJWIkS0Kuq/tXZshuZIU12WRujz5MPATCtPBcKI4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643791784; a=rsa-sha256; cv=none; b=IoPxlU+naazdn9NxBK0TN30h83IBZq+X5Wy/hMCfutOL/LUnhhDztTBfnqDnIcMpE2rW5e wPsLJom5CB3o04omRxCKpquhX4v6tjl9sK3IOnM64MuSYjB0/uovvajIXgtJt9+r/Q8h/Z YgwApOxMx4wuDLMJHA5T6gyiZynrVYYGlcbtRb1opSf4t3pzkPsK7AIGPBkNjZ0Qbb1pb3 8WYt/RuyD6bGV4nFocAWSMDns7OjsXscvsDlRqzJCK5dVuD+v5OdelJOZ0G4PUEFT1SKTz SZ5/8gTEv9Imtj85ZyDMHtZPcSPsplt6w5+lur4juBRmjPwTj8dfLoNa3Vxx0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2022-01-26 09:35:17 +0000 Commit: Gordon Bergling 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;