From nobody Sun Aug 14 19:27:56 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 4M5S9m5t1nz4Yv8q; Sun, 14 Aug 2022 19:27:56 +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 4M5S9m5CpQz3M50; Sun, 14 Aug 2022 19:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660505276; 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=gCbUz9EO1jQST/sBlHHH8X5RwhxzBOJDD1sy2MUw3Kg=; b=VZa09YzG7pif9ipn8MzymmTBVY9+LqQx78l0583R0JL3lA0W+lOleepcXBuNZWurSYBTFY f2I4RKJprovluRbbOZoU3ReQh4GafKCJJGydjNsRV1I7s9OGO3vKzeokFi2ms2xGuW2WxA 9mMJw7s21cqrGuSnSJPXbZOCMbETdvpfhH56qfkcPZFvNJRBSlEFG0oFkcloTVbnhLuzDg 5LsDKPP3BuQw6ub2ZMpDWxr8whVYwV/1UULmpMVyiFGn5wFT0pEAV0s+MqXYxvkGCPGLId akgo/Jjf/s3K86L9T7+Uw0+mDXyeaAqdRclltZ9gXwJl0XV7b2QL/LsiTnwbSA== 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 4M5S9m4KhNz12Zy; Sun, 14 Aug 2022 19:27:56 +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 27EJRuNw044334; Sun, 14 Aug 2022 19:27:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27EJRulW044333; Sun, 14 Aug 2022 19:27:56 GMT (envelope-from git) Date: Sun, 14 Aug 2022 19:27:56 GMT Message-Id: <202208141927.27EJRulW044333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 762489657117 - main - Fix unused variable warning in tcp_stacks's bbr.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 762489657117037d963aa840374280583acd32c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660505276; 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=gCbUz9EO1jQST/sBlHHH8X5RwhxzBOJDD1sy2MUw3Kg=; b=iB292QJc+TlQcKwx3QNAXVBmXzuDz7gtWOGBUYLj+qn2sZtKlryzNP0wl+mIsoRoNjRbKH CmlP1NDTuIi6c2XxsAjfzlvnZG306JakSvnlhyJ6JbPO0a1W21pNgHGMw+gR11z7S7uWCf BrzVMe9q9Qyrpp8Uyq70ifZMZYokB6N5TuAxJFou82RzFXx7zAFMGsy7kqNwCUwjEm52C4 xLq+6DFxJIJVvRzR/4/C+ujbAwTZgXosOOQWZktuFiFYzMgVwnuSeU1nb99C50WC2vQxlW nsl8Yga5kzDruttfiZEIQUA6syb8WAE9CHq3hLmsUmNoRPSqthJdDqh6/+yHuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660505276; a=rsa-sha256; cv=none; b=rctGRcvAdNjCngZ7BODac9vZ87EmUr7U7+1FHO69duQ9pk5IvCmjuOdG4d0HuGge0Z0h1S pMwOBHGESzq4FIVljThwvCf5QtVuGFmtHEZKOmhJLhf9izyHFB48uBeohIn54lB5sVInzU DO95ZMk6R5ngfYwMKCQe3LbnoCLu4Hjk3QkU6QOhT7yWq6HaTbELqPxKRMwCzysVjB8YXT GHF+dHHroxgBCoOoNxfevBxd5+/abjngVPbObqFiL8/vt6LgojMIDLu7hhQOUjb4VTGHlK BAwpeRv3aYUZiYBtG0YCNyjsc3sKv8c5/TiADtoEVJdzmGltPC5//nY8DJJWkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=762489657117037d963aa840374280583acd32c2 commit 762489657117037d963aa840374280583acd32c2 Author: Dimitry Andric AuthorDate: 2022-08-14 19:06:07 +0000 Commit: Dimitry Andric CommitDate: 2022-08-14 19:27:34 +0000 Fix unused variable warning in tcp_stacks's bbr.c With clang 15, the following -Werror warning is produced: sys/netinet/tcp_stacks/bbr.c:11925:11: error: variable 'rtr_cnt' set but not used [-Werror,-Wunused-but-set-variable] uint32_t rtr_cnt = 0; ^ The 'rtr_cnt' variable was in bbr.c when it was first added, but it appears to have been a debugging aid that has never been used, so remove it. MFC after: 3 days --- sys/netinet/tcp_stacks/bbr.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 9d5a3d52776e..47c7f1ee0eee 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -11922,7 +11922,6 @@ bbr_output_wtime(struct tcpcb *tp, const struct timeval *tv) int32_t prefetch_so_done = 0; int32_t prefetch_rsm = 0; uint32_t tot_len = 0; - uint32_t rtr_cnt = 0; uint32_t maxseg, pace_max_segs, p_maxseg; int32_t csum_flags = 0; int32_t hw_tls; @@ -12242,7 +12241,6 @@ recheck_resend: goto recheck_resend; #endif } - rtr_cnt++; if (rsm->r_flags & BBR_HAS_SYN) { /* Only retransmit a SYN by itself */ len = 0; @@ -12291,7 +12289,6 @@ recheck_resend: bbr->r_ctl.rc_tlp_send = NULL; sack_rxmit = 1; len = rsm->r_end - rsm->r_start; - rtr_cnt++; if ((bbr->rc_resends_use_tso == 0) && (len > maxseg)) len = maxseg;