Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 03 May 2026 23:51:59 +0000
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 24b9fb4376ca - stable/15 - ip6_mroute: Pass the multicast interface number directly to del_m6if()
Message-ID:  <69f7df9f.277eb.32868782@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/15 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=24b9fb4376ca40e94f19c17edf117c2d2476bb83

commit 24b9fb4376ca40e94f19c17edf117c2d2476bb83
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-03-30 13:33:11 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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);
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f7df9f.277eb.32868782>