From nobody Fri Jan 13 21:24:41 2023 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 4NtvZL1wyXz2qkdm; Fri, 13 Jan 2023 21:24:42 +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 4NtvZL1CRRz40W3; Fri, 13 Jan 2023 21:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645082; 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=QhHnTWaOXtg8xWXS8jXk7gG4LFQB85i5f9/pWAmBM2g=; b=w4Rl2yIGxyLpm1/F6cjv4BcrwvzgAe3wrUEh/h3GaR+Mvo9JanTox1zzCCdFwvgdjwQTdd f5bdXHSUyKWVkaAkJvJb3kKU9x9O+qDxrC3sr5NEMJWlkYMl4V8ErEOwEZpdubC2hODE6u AlECYYMBglDmIcENSKDzLLfKxfyW1P7PEtSO1LH68Dwg/DwrVXLetKQ2GcLvm05ImYM5dn cxw0577eD4WOV8/euOA520MIzF+aySL2G4jQIrlKmIXdTCqEHuWxFHksMkFZmV6l4VY33w qraYcNuL541EeBv42HoyZlS9Gzzl4uH1WRCUVloBn3TdB51GIFgRQwvy2S9hlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645082; 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=QhHnTWaOXtg8xWXS8jXk7gG4LFQB85i5f9/pWAmBM2g=; b=XdUvc6gPbNC3v8c5vjdtrHDkwbVSrG/fBXeKlI8UOiX+PhMg3YdozLUFfafi6+rOKZGnBW n2xEf1LpSzB//+Keecorpx3iUVElpKIWivTG8YpTpTmGvOTYob7xbmi08UlRtLSvVw/ZAE a2PsfVnR6RpW/9/KmUkxwQrqTVumOOSQBWqajyKBrLSznSTM8WOQ2r+dwyL81A8SMoMDiL LiEJeJgSxFQHc+gsUzEWA8NDd43GXP1Tdh1tNHL8fLciZ6eqOoDAS6YBUCW+xzqnj4+wsR vhCioAvUJpT3YlYbN943efxbuZtNRFjb8uAlRAAwOgVpIORsLVSmp5PTw1629w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645082; a=rsa-sha256; cv=none; b=BnSmca4QDW7zQpFElPnaP3Cs8Bek/GDr6mHf7sMnnfG++pEk8+nRnMqlZ+DKhlhyTxvq+J 5gztPkkgKvnIvh29CenjS7e/tRf0B+Pos8rxWt43ICiEpkHH5bpSA6rgETnrZVaY46bvAS hwlw6A1UohPR6oZmy070F9Qd/3U1eclyBrpTTJN//zVN9AL8iBdVuMNAcQj9MCxrBMUnzc I1dmJrNxZwUK1WaXuiGbNCcHtjCAvhFLWNJU+aWYRIge2CVcEZmLlQ8XxXW3VSq9ES+/+/ /RhXwrnFvsfxUZP919SLW7BIY62vsQgTsfKVNwSOuKfxWHFon8r5nYvQlb5E1Q== 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 4NtvZL0BXjzNGR; Fri, 13 Jan 2023 21:24:42 +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 30DLOfui040373; Fri, 13 Jan 2023 21:24:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLOfgi040372; Fri, 13 Jan 2023 21:24:41 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:24:41 GMT Message-Id: <202301132124.30DLOfgi040372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 86f499e00177 - stable/13 - unlink_nhgrp: Remove write-only variable. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 86f499e001779cd2f4379693aa4d9c2d00d24c70 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=86f499e001779cd2f4379693aa4d9c2d00d24c70 commit 86f499e001779cd2f4379693aa4d9c2d00d24c70 Author: John Baldwin AuthorDate: 2022-04-06 23:45:27 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18:25 +0000 unlink_nhgrp: Remove write-only variable. Possibly one could assert that ret should always be 0 here (that is, that there was always an index found in the bitmask). That should be true since a bitmask index is allocated before the nhgrp is inserted in the ctl->gr_head list in link_nhgrp. (cherry picked from commit 371c917b0b450d1944bf0ea18afdfc158af08f2e) --- sys/net/route/nhgrp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/nhgrp.c b/sys/net/route/nhgrp.c index d93fd5053c30..de53c792aea9 100644 --- a/sys/net/route/nhgrp.c +++ b/sys/net/route/nhgrp.c @@ -188,7 +188,7 @@ struct nhgrp_priv * unlink_nhgrp(struct nh_control *ctl, struct nhgrp_priv *key) { struct nhgrp_priv *nhg_priv_ret; - int ret, idx; + int idx; NHOPS_WLOCK(ctl); @@ -201,7 +201,7 @@ unlink_nhgrp(struct nh_control *ctl, struct nhgrp_priv *key) } idx = nhg_priv_ret->nhg_idx; - ret = bitmask_free_idx(&ctl->nh_idx_head, idx); + bitmask_free_idx(&ctl->nh_idx_head, idx); nhg_priv_ret->nhg_idx = 0; nhg_priv_ret->nh_control = NULL;