From nobody Sun Aug 21 11:29:01 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 4M9YCy1b96z4ZYYR; Sun, 21 Aug 2022 11:29:02 +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 4M9YCx3jwtz3wg1; Sun, 21 Aug 2022 11:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661081341; 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=IE+MQMnx29W+8EsZ8JXXfc0vrQtAy+UlSF0Bsbt3tII=; b=a53ONqx9WejcDZHNRuRc/0MNGXFFJIRPebelxhVoogDd7zgFVitZ/Z0miRnaKY+3IxW0uu dkEfyTtUjaXCzZJPytHV/TofjaOU6oVKaLB7R50U49Ddx4F5xbT927pWuvzg4m8H5wconC 98JhTS8h2CC2s7dgMxVswiK8TwxPnYVzozfdtcd2NKYJO1Ej9WQd4h3zHPddBUbmDrUTaX +Ce4purqXEL+ZW/SS8qDBtlPKz92GzsfET3C+SUdyLXr1BzujTTZ8IrzNXxIwFFYr2dKQ0 wktrxAlT6tPEJBPmSIRucN61R8ukoPQmbz5rj9oesJdwjU3MIF5xXdtZHAJDbw== 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 4M9YCx2q6Gz1892; Sun, 21 Aug 2022 11:29:01 +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 27LBT1rb004232; Sun, 21 Aug 2022 11:29:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27LBT1s7004231; Sun, 21 Aug 2022 11:29:01 GMT (envelope-from git) Date: Sun, 21 Aug 2022 11:29:01 GMT Message-Id: <202208211129.27LBT1s7004231@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: a7d40321e80c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a7d40321e80c6f3bb15b93be10970cc154f0a6a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661081341; 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=IE+MQMnx29W+8EsZ8JXXfc0vrQtAy+UlSF0Bsbt3tII=; b=AnRNB5DJR4/1XbX0mQ8SkzhUvIFiFClohKwDXlnZGFstwoKIEU15TGxbpBZATEcC1K3WdP wKw/62CSoDPq58W/Uryuzx4dhR+OcaFm6ilRnj+T4lQDhOhSrkHp590GkFPBoHTiIikbrt 8aBXErb6TAnJm+jk0O+K9AfCm/eVPCPywtOHr2miYvl5KV6z2xQg+8j0TbGPiJBaySwQTV KvL+CkF7782M28YitszYlO/gxa7FLunN2SZmCss4WVCsO/iMoF4w/uprzcQv3G/7fwTTZu e/Xnnzl8Bx7htgNzyEcC+p05Dff54PlC5pyVhH8mWk3OuvcVBN568UQMJRq0dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661081341; a=rsa-sha256; cv=none; b=bYdtLwmQn2Db6FaRui2jVU5W44cVsNMxfKUk+6znvxy1hjDT3c/rH90D5DoE0OV97MLzmB N8Esdtm+mDh899Jt9FrG99qpcgJVxY+L4rVpaEa73xVYKLDi/D2VfsTww24p6Bfk+p9r2l nOuRjXpvjKLoI5UlbePvWnplFv5uhpKl7RXum7nPPuuiO61mDup7OkyUcIFCam8xbh8XGs +s07Juf3q7THDOR198zAt5PWuy9W2lA/hOeGhNXzfHiBWo0co9nQKeo2/zgvTP72HyXydB hWMalLxZIdzskcs6POqRt3lye8ImpPb7+PhBFDvWdnWUuT9tyCkQZ2H0LsfHZA== 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=a7d40321e80c6f3bb15b93be10970cc154f0a6a2 commit a7d40321e80c6f3bb15b93be10970cc154f0a6a2 Author: Dimitry Andric AuthorDate: 2022-08-14 19:06:07 +0000 Commit: Dimitry Andric CommitDate: 2022-08-21 11:10:50 +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 (cherry picked from commit 762489657117037d963aa840374280583acd32c2) --- 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 8f1c0f58b627..008b43829613 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -11957,7 +11957,6 @@ bbr_output_wtime(struct tcpcb *tp, const struct timeval *tv) int32_t prefetch_rsm = 0; uint32_t what_we_can = 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; @@ -12270,7 +12269,6 @@ recheck_resend: goto recheck_resend; #endif } - rtr_cnt++; if (rsm->r_flags & BBR_HAS_SYN) { /* Only retransmit a SYN by itself */ len = 0; @@ -12319,7 +12317,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;