From nobody Sun May 3 23:51:59 2026 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 4g81lh5dJ1z6bvw6 for ; Sun, 03 May 2026 23:52:00 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g81lh0hLyz3gkC for ; Sun, 03 May 2026 23:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777852320; 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=X/3IAcbgK2DEillOhDDu0ke4VHj1fNvKCg9+ZptCowY=; b=ZbLcUdMOvLU1H4haXMGz4sF6vOhAWUpK8RYJrYu0OHncH05HCOaSW3vuYvwF8Y8JhueKHe TomUlX0op6OIc6bbXfFGz2DfMTltxxOAurHs6t1iHI3sRA9BZ7NLHJkKcfCPmQonuHq3UU wWZIjcQy0qbHtbtr0jFwGI4DaMajWREuuw3wxTfJ4hZQ45/eGokngfiPjmlXFomkuxKjWr LM9zNb/KmUyHTTQMJ4eCM/6y+m/vEdhPfHdPl71PPXGipJwOiJ3/bogVTVc4mgCywo4bms Mfj8E1JjEqU2InxCSYxbTSH19wp8DJTYAcz2hKdLy95Yp8P2QHVeH8SU2j5tjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777852320; a=rsa-sha256; cv=none; b=ts/bzoJ5knq5EuhqdH+oYxNEsdaizaVr9o/L5X1jszCglihzFoqlheMkWF7HcHCOQT4aSY Q52bPjkI06n1NnwPg5hSeaB1qVGFtUVW7TkfuHETKGZQE9YCP8LFhMz7DvrX8mBX6LVDFs SMgA1bQjI6jy37wL48YkFE4Tz3PiUWjcNUHhVflaZTUHQttnbDJrWDhPO0rECH6K0VzZNE 1Xy6LA0nlOfGmt3omq7pQRq8sXphsKSSE3Yk91cwVAUXQnpHaf23mf9lm+f38HRv2owJ7C Y/96u+wFYYFDf1WouCHIoa2rEtshXcrww45gEF2+HbV2mHL5RhxwnNIby7ekyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777852320; 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=X/3IAcbgK2DEillOhDDu0ke4VHj1fNvKCg9+ZptCowY=; b=oeDb5Cane5SbWyAT4x3sFuHCpJk6XSKjchWp5LgH2sdqvpAwZ6cVKjyTg9ZPbTQUNteXT5 TEcu9fMvCQcJiNFTeaoqDn7j2CfCf4s7WqPrQW72K0dEObUWMzB6ItXKZVuuniEgpywcG4 yGX98ftkObGfeSUowdKI1TTBTR2DiA51olbOB4pXMfBvtGwi04i19UfMZrw9ByYCL4y12D gJO8CTeP1OEDkkdkA3Wjdp799yazoONXNIzQ/qcb1NUDR6Ead9WLzTDpU2F4Z6fi/x3n0J V1eUDWJ//cm/YoEwople9SkDigXU7YlZcIRg+qxO0Hp5uhh4UGgWeoTEq5PTAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g81lh03MMzvJm for ; Sun, 03 May 2026 23:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 277eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 23:51:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 24b9fb4376ca - stable/15 - ip6_mroute: Pass the multicast interface number directly to del_m6if() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 24b9fb4376ca40e94f19c17edf117c2d2476bb83 Auto-Submitted: auto-generated Date: Sun, 03 May 2026 23:51:59 +0000 Message-Id: <69f7df9f.277eb.32868782@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24b9fb4376ca40e94f19c17edf117c2d2476bb83 commit 24b9fb4376ca40e94f19c17edf117c2d2476bb83 Author: Mark Johnston AuthorDate: 2026-03-30 13:33:11 +0000 Commit: Mark Johnston CommitDate: 2026-05-03 23:10:43 +0000 ip6_mroute: Pass the multicast interface number directly to del_m6if() There's no need to pass a pointer to the interface number. No functional change intended. MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55245 (cherry picked from commit 82272cbf56aa5646611c6f1049501cc345fcf6ec) --- sys/netinet6/ip6_mroute.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 318c9021145c..cc2c7260ac80 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -352,8 +352,8 @@ static int ip6_mrouter_init(struct socket *, int, int); static int add_m6fc(struct mf6ctable *, struct mf6cctl *); static int add_m6if(struct mf6ctable *, int, struct mif6ctl *); static int del_m6fc(struct mf6ctable *, struct mf6cctl *); -static int del_m6if(struct mf6ctable *, mifi_t *); -static int del_m6if_locked(struct mf6ctable *, mifi_t *); +static int del_m6if(struct mf6ctable *, mifi_t); +static int del_m6if_locked(struct mf6ctable *, mifi_t); static int get_mif6_cnt(struct mf6ctable *, struct sioc_mif_req6 *); static int get_sg_cnt(struct mf6ctable *, struct sioc_sg_req6 *); @@ -447,7 +447,7 @@ X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt) error = sooptcopyin(sopt, &mifi, sizeof(mifi), sizeof(mifi)); if (error) break; - error = del_m6if(mfct, &mifi); + error = del_m6if(mfct, mifi); break; case MRT6_PIM: error = sooptcopyin(sopt, &optval, sizeof(optval), @@ -796,17 +796,17 @@ add_m6if(struct mf6ctable *mfct, int fibnum, struct mif6ctl *mifcp) * Delete a mif from the mif table */ static int -del_m6if_locked(struct mf6ctable *mfct, mifi_t *mifip) +del_m6if_locked(struct mf6ctable *mfct, mifi_t mifi) { struct mif6 *mifp; - mifi_t mifi; + mifi_t tmp; struct ifnet *ifp; MIF6_LOCK_ASSERT(); - if (*mifip >= mfct->nummifs) + if (mifi >= mfct->nummifs) return (EINVAL); - mifp = &mfct->miftable[*mifip]; + mifp = &mfct->miftable[mifi]; if (mifp->m6_ifp == NULL) return (EINVAL); @@ -827,22 +827,22 @@ del_m6if_locked(struct mf6ctable *mfct, mifi_t *mifip) bzero(mifp, sizeof(*mifp)); /* Adjust nummifs down */ - for (mifi = mfct->nummifs; mifi > 0; mifi--) - if (mfct->miftable[mifi - 1].m6_ifp != NULL) + for (tmp = mfct->nummifs; tmp > 0; tmp--) + if (mfct->miftable[tmp - 1].m6_ifp != NULL) break; - mfct->nummifs = mifi; - MRT6_DLOG(DEBUG_ANY, "mif %d, nummifs %d", *mifip, mfct->nummifs); + mfct->nummifs = tmp; + MRT6_DLOG(DEBUG_ANY, "mif %d, nummifs %d", mifi, mfct->nummifs); return (0); } static int -del_m6if(struct mf6ctable *mfct, mifi_t *mifip) +del_m6if(struct mf6ctable *mfct, mifi_t mifi) { int cc; MIF6_LOCK(); - cc = del_m6if_locked(mfct, mifip); + cc = del_m6if_locked(mfct, mifi); MIF6_UNLOCK(); return (cc);