From nobody Sun Aug 21 11:29:05 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 4M9YD23HLXz4ZYWS; Sun, 21 Aug 2022 11:29:06 +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 4M9YD20QKvz3x1H; Sun, 21 Aug 2022 11:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661081346; 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=gy92MyC/adzG07ZLAh87iee+I/l/8fQ8xCgJKKM1E/o=; b=UAIWfk1NgUd2D4cqCSl7Zw6Qh5PPZHS0oMGtF/lJyEeAoNnTzdlXMGyegd0UTDE9WJfm7q KFHk2y+8byj2Vof86AGCr58S+IedXXdhEI2/1uVNU8oZo6usXbCVzHTsKrPi1qhBbV5ekJ RSbprJ3DWA3kVA++Qpp5HPO00Y26Lm2G1/xj4CIJ99rfx+3nN+m23xVPc6b0qgYD504mVn udDiESS6FMi2N4mF+EasIG4/fnXHuc4waiHSYRsciH9bppLXkRcN8RRfAYn2z5xFRofvTS e3KHb2WTWvUGwTi/NXK+o4vU4GP1wCTFlWpnsI8ZL1K5yAQZk8J32GHb63MlnQ== 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 4M9YD16d1yz18KR; Sun, 21 Aug 2022 11:29:05 +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 27LBT5dK004342; Sun, 21 Aug 2022 11:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27LBT5RF004341; Sun, 21 Aug 2022 11:29:05 GMT (envelope-from git) Date: Sun, 21 Aug 2022 11:29:05 GMT Message-Id: <202208211129.27LBT5RF004341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7593646bac79 - stable/13 - Fix unused variable warning in tcp_stacks's rack.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7593646bac7900a2b5da5b7ac8845017da7f77cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661081346; 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=gy92MyC/adzG07ZLAh87iee+I/l/8fQ8xCgJKKM1E/o=; b=O5AIeTahDyHE7OLhYF4/DheC/eoyQwjG/+aDWZ0/ITHPr0AClCw2xqH09fHGSzjz3MZjmN zx0kjjAhh/kNrILkh2Z8k71y8q+9g4ijIs/u4TiUCXsniPAEdZsx7MpNkd05YOQ2Z7HZVB dnUV1COY9Db/EwPZvyQKNviKTH/jqqNHiNS1OYFxrbjN3I0esWBTGsKdne/OUr60Lx0tSK f71SsaxG5wjgcW2OMeO+TDNZt0EiQigZXemlNlNjxIcMC+acnfznAYz2enYql2dZuxdzUu yIfbjZpGdGWl/19+cedBSFmfyum8HbaVmaAvEAHPZuFYmdyP6+Ps/uQAjGHrtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661081346; a=rsa-sha256; cv=none; b=ZOt98YeeQvlZSZxlcM22UWvPTOgdWzRXPVJuyv2EJH84DyXLX65A1kJ3ySrE//gbVP54ug Q/O3Lw94oL3B9m5VpHaluHCYo/a87ObuMIO5FkdwrnpXChXWtV9oxEtRjNBX/Xh8k5moA2 fhQ94+OoQGh5UoLtHjAv5SXO0Duh38Rj3Tja9SJ71hediLZYpMbLw4TpaCwC8ir4o5V3EV xlUkiomNd7N13eXUIFKCDL35+rVI0onu9hBj1HfOBPNv3xgPXzPICkgTAk8eGBOBhVB4NP KZispenEMZHGuK8yoEBCgv5hNWknlp84M/3GsSqv0Hu9kikjyDiMu5lB72Humg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7593646bac7900a2b5da5b7ac8845017da7f77cd commit 7593646bac7900a2b5da5b7ac8845017da7f77cd Author: Dimitry Andric AuthorDate: 2022-08-14 19:13:40 +0000 Commit: Dimitry Andric CommitDate: 2022-08-21 11:13:17 +0000 Fix unused variable warning in tcp_stacks's rack.c With clang 15, the following -Werror warning is produced: sys/netinet/tcp_stacks/rack.c:16148:6: error: variable 'cnt_thru' set but not used [-Werror,-Wunused-but-set-variable] int cnt_thru = 1; ^ The 'cnt_thru' variable is only used when TCP_ACCOUNTING is defined. Ensure it is only declared and set in that case. MFC after: 3 days (cherry picked from commit e967183cb030dfc349c264520e5710bac70bcdd4) --- sys/netinet/tcp_stacks/rack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 2f9ea65c5ec2..30508f5666d8 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -15709,7 +15709,9 @@ rack_fast_output(struct tcpcb *tp, struct tcp_rack *rack, uint64_t ts_val, struct tcpopt to; u_char opt[TCP_MAXOLEN]; uint32_t hdrlen, optlen; +#ifdef TCP_ACCOUNTING int cnt_thru = 1; +#endif int32_t slot, segsiz, len, max_val, tso = 0, sb_offset, error = 0, flags, ulen = 0; uint32_t us_cts, s_soff; uint32_t if_hw_tsomaxsegcount = 0, startseq; @@ -16077,7 +16079,9 @@ again: max_val -= len; len = segsiz; th = rack->r_ctl.fsb.th; +#ifdef TCP_ACCOUNTING cnt_thru++; +#endif goto again; } tp->t_flags &= ~(TF_ACKNOW | TF_DELACK);