From nobody Tue Feb 22 22:34:32 2022 X-Original-To: dev-commits-src-branches@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 E43EB19E023E; Tue, 22 Feb 2022 22:34:32 +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 4K3DVw68P6z3JKD; Tue, 22 Feb 2022 22:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569272; 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=MNrGG6pMGZipHhtdpwwMOk02YyS/4bjMfbhEI0htOIs=; b=akB/wQv/44OJ9Rp78YR0LnzZkSSZaw+oBHNCEMtMJ3grUw+BOAAvkX+7kP7Oha0h9X9RF2 JW/ejJvmuq4U0n23s4etcAnrcyLGn9u7qNhRdz/uP9zLtfvnWIqG7eAbaopmyKroEYHA3P REjYPBQSshnnlwYgBLwk6U/hf1xg88iLvSCTuevOow86JK2DGveG3/BjhGqxq8EkdFMRUd xaYc0VdPnBZ0JNdMEv8FcX9km/sH+AFO2LocTudt/XMvCx+zRsr/gObeSMHueORopq6Gnh WKvGL6Zcs1XJr+aGKN2RDqBoUCClshDv5dXCPu0klBk8oaRJHRbR6ETq34Po9A== 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 B2F444965; Tue, 22 Feb 2022 22:34:32 +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 21MMYWTi041525; Tue, 22 Feb 2022 22:34:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMYWl2041524; Tue, 22 Feb 2022 22:34:32 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:34:32 GMT Message-Id: <202202222234.21MMYWl2041524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: bc107e4e5984 - stable/13 - sctp: remove some set, but unused variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bc107e4e59841f7fbb2ee705a210317a0e887b72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569272; 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=MNrGG6pMGZipHhtdpwwMOk02YyS/4bjMfbhEI0htOIs=; b=GK5kNEXwgGqlEpW0E6isPUGiUxp924KFvUzzCXIcK3frU5L//ol199ZX9ZcogYHoNg+rEH CpwfaVyOrHeIV/levEAsT4ujC3VqGhznpBSWsW7nwYbAcxaTskl8iJNoA99KHFqOohKnGX TWd0FYaX1QKZSHQAi/kr4ObSaksSQNDuq1whRWG9o8RQWJQXm5PKkASpT9oVftzQrQ1AAO g3LqHaFdGtnwpwbxQh2sfKQ2A5IP51nXtTWMymU2GtXwjjTF1ZK4T8fCL59dHr8bRkWG7t vjvIpiN7+32EuzMSOpqdxW4w35Y9IYQI+9YwHcknMtz4uXKijAdjmZB4inHviQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645569272; a=rsa-sha256; cv=none; b=S2dtk+p9e6zW/w4GbvlEEWUgLobsJrtahye/keEXH//NhNrvvIaKCUFUhKGgsZ1lFCieH3 QKd4YwB8dyJ+uhMohVMbxnQnxPNjVU0OAqslfcM/0Pan255ufU/N0odcK/0p1k25jIgAKd EToA57HZUuB9eeZ07qkFc8y7Ze4Vvgf1Aa27jFgolzaA7vMvGJnsBJFs+VXKzdoCmnuHrC kNUTPfS9J5ZPYm05T/cwma43Ad/5vzHyh0L7zauuBAITqHDqoiz2Prwfd3fC67gqxdugpb SuOcqHjC+k9sL14LCXF1xN8oFtL4pZ2mTfmznp/M3txha2Ip9yX7uFp5oydmMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bc107e4e59841f7fbb2ee705a210317a0e887b72 commit bc107e4e59841f7fbb2ee705a210317a0e887b72 Author: Michael Tuexen AuthorDate: 2021-08-09 13:58:46 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:34:09 +0000 sctp: remove some set, but unused variables Thanks to pkasting for submitting the patch for the userland stack. (cherry picked from commit 3808ab732e6a044cc101cf22027a0db2ac4ad58d) --- sys/netinet/sctp_cc_functions.c | 4 +--- sys/netinet/sctp_output.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index 7ad456d08d80..81b9e28f9959 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -685,7 +685,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, { struct sctp_nets *net; int old_cwnd; - uint32_t t_ssthresh, t_cwnd, incr; + uint32_t t_ssthresh, incr; uint64_t t_ucwnd_sbw; uint64_t t_path_mptcp; uint64_t mptcp_like_alpha; @@ -694,7 +694,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, /* MT FIXME: Don't compute this over and over again */ t_ssthresh = 0; - t_cwnd = 0; t_ucwnd_sbw = 0; t_path_mptcp = 0; mptcp_like_alpha = 1; @@ -704,7 +703,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, max_path = 0; TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { t_ssthresh += net->ssthresh; - t_cwnd += net->cwnd; /* lastsa>>3; we don't need to devide ... */ srtt = net->lastsa; if (srtt > 0) { diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 0f4ddd40753c..4fa2e8045258 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -12486,7 +12486,7 @@ sctp_lower_sosend(struct socket *so, { struct epoch_tracker et; ssize_t sndlen = 0, max_len, local_add_more; - int error, len; + int error; struct mbuf *top = NULL; int queue_only = 0, queue_only_for_init = 0; int free_cnt_applied = 0; @@ -13046,7 +13046,6 @@ sctp_lower_sosend(struct socket *so, */ local_add_more = sndlen; } - len = 0; if (non_blocking) { goto skip_preblock; } @@ -13247,7 +13246,6 @@ skip_preblock: } sctp_snd_sb_alloc(stcb, sndout); atomic_add_int(&sp->length, sndout); - len += sndout; if (sinfo_flags & SCTP_SACK_IMMEDIATELY) { sp->sinfo_flags |= SCTP_SACK_IMMEDIATELY; }