From nobody Mon Mar 30 16:15:44 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 4fkxDw6q4Rz6WyXk for ; Mon, 30 Mar 2026 16:15:44 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fkxDw528wz49s4 for ; Mon, 30 Mar 2026 16:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774887344; 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=Eu5veCcytXzV+kdh+9OkMhCBMspATGSE9aUF4A6vm84=; b=gYauoaFvaZ8v50WluiEMGybsjCidfRw3svx+BGaC8fA9QBTQABGxFDQACVjWi+wrOTGHs1 scbJa59KcvhhW6lfqaXGkrexF+ACNi9vB9fYI/AU+BEXu7Wh4n5YUSi9eKfmejLfZrNidN aqQzkvCNO/O8YgUkVOdEeslnknpCUnvhncnziQYI7cd6jLeduwJ6OyXHpjcgE1dnyBxwkW xGPwzuclcXcytkkWz7HWT/w0nqMoXu95waIEe8588v4VdL1RHrWm0zHRrkCgeIvRi6ncuG f/Lq91+LPAUle+Sno5uml7uPjl4CbPKgmQlutZxIrMmF0dvIazMQDwjfeat38w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774887344; a=rsa-sha256; cv=none; b=fvOqB7zMKB1okRuwYyMuDXisFNc0RNu5DS6UlHOxjNoa+D2GLdba9L+8ZlusPErGv/YwOW 6Ia6Fx7rUHgzhR7PYqDvK4s4rMt0F+ETs4LeIwLH8wJ7aOx/XoURmuv6B9Hc7aH7eEOv3L HSkDmEPwzJYKSsS9TmTK5ww2MgOPLWkzM6jRBG3ZELJbitsabrbp1XtmHDHorTGBDEhKSZ pku4vgAJS5N1lZEZweGDV/pPI5D6lisyka1AwmiBGM380BXT5/MznRKQsvDl/ow8nBuGTh kPcYsbtBHRL7kuqncI4fPSdT+vkh51GGghfmUsoIcwkeDLaT0qzOoOSgaxvm2g== 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=1774887344; 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=Eu5veCcytXzV+kdh+9OkMhCBMspATGSE9aUF4A6vm84=; b=fGmYFW/ROS330vue2Ydrkfj4XHWGA3lhcppbrMEZ/ZbFEN64umCommPYyYRx6/jRvDppLt 4WauneCjii/Mc4W8CX6KOtIh/ZW3POvsfhu0cTkzNuKP51gjP3+8gozqcNgbmBdwByZQYJ 1dctyOqJc+mZOfGUImcRB1eIhlul567qUdJDotNeiqRfV48dbkp9QJf9KTn0s/YaZ149aa v0dr87CBzXu6tbHAwkpkSb2TMWrrBjqnMWybBRvQmH3DUX/JWNj8Ajg+gkJYUSCpF9ysbP T3uisVulL4iIfEp4HivBfyr2PPpzK0zzHzKMOoUwqANZD5I7JsDAvK+QYv3M8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkxDw4Z3Jzqkc for ; Mon, 30 Mar 2026 16:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 16:15:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 82272cbf56aa - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: 82272cbf56aa5646611c6f1049501cc345fcf6ec Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 16:15:44 +0000 Message-Id: <69caa1b0.3bf42.2c9af642@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=82272cbf56aa5646611c6f1049501cc345fcf6ec commit 82272cbf56aa5646611c6f1049501cc345fcf6ec Author: Mark Johnston AuthorDate: 2026-03-30 13:33:11 +0000 Commit: Mark Johnston CommitDate: 2026-03-30 16:08:21 +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 --- 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 52fd319ba4f4..f9541203a747 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -351,8 +351,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 *); @@ -446,7 +446,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), @@ -795,17 +795,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); @@ -826,22 +826,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);