svn commit: r353850 - head/sys/dev/malo

[Gleb Smirnoff]

Author: glebius
Date: Mon Oct 21 18:11:54 2019
New Revision: 353850
URL: https://svnweb.freebsd.org/changeset/base/353850

Log:
  Convert to if_foreach_llmaddr() KPI.

Modified:
  head/sys/dev/malo/if_malo.c

Modified: head/sys/dev/malo/if_malo.c
==============================================================================
--- head/sys/dev/malo/if_malo.c	Mon Oct 21 18:11:48 2019	(r353849)
+++ head/sys/dev/malo/if_malo.c	Mon Oct 21 18:11:54 2019	(r353850)
@@ -1510,49 +1510,46 @@ malo_init(void *arg)
 		ieee80211_start_all(ic);	/* start all vap's */
 }
 
+struct malo_copy_maddr_ctx {
+	uint8_t macs[IEEE80211_ADDR_LEN * MALO_HAL_MCAST_MAX];
+	int nmc;
+};
+
+static u_int
+malo_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int nmc)
+{
+	struct malo_copy_maddr_ctx *ctx = arg;
+
+	if (ctx->nmc == MALO_HAL_MCAST_MAX)
+		return (0);
+
+	IEEE80211_ADDR_COPY(ctx->macs + (ctx->nmc * IEEE80211_ADDR_LEN),
+	    LLADDR(sdl));
+	ctx->nmc++;
+
+	return (1);
+}
+
 /*
  * Set the multicast filter contents into the hardware.
  */
 static void
 malo_setmcastfilter(struct malo_softc *sc)
 {
+	struct malo_copy_maddr_ctx ctx;
 	struct ieee80211com *ic = &sc->malo_ic;
 	struct ieee80211vap *vap;
-	uint8_t macs[IEEE80211_ADDR_LEN * MALO_HAL_MCAST_MAX];
-	uint8_t *mp;
-	int nmc;
 
-	mp = macs;
-	nmc = 0;
 
 	if (ic->ic_opmode == IEEE80211_M_MONITOR || ic->ic_allmulti > 0 ||
 	    ic->ic_promisc > 0)
 		goto all;
 
-	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
-		struct ifnet *ifp;
-		struct ifmultiaddr *ifma;
+	ctx.nmc = 0;
+	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
+		if_foreach_llmaddr(vap->iv_ifp, malo_copy_maddr, &ctx);
 
-		ifp = vap->iv_ifp;
-		if_maddr_rlock(ifp);
-		CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-			if (ifma->ifma_addr->sa_family != AF_LINK)
-				continue;
-
-			if (nmc == MALO_HAL_MCAST_MAX) {
-				ifp->if_flags |= IFF_ALLMULTI;
-				if_maddr_runlock(ifp);
-				goto all;
-			}
-			IEEE80211_ADDR_COPY(mp,
-			    LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
-
-			mp += IEEE80211_ADDR_LEN, nmc++;
-		}
-		if_maddr_runlock(ifp);
-	}
-
-	malo_hal_setmcast(sc->malo_mh, nmc, macs);
+	malo_hal_setmcast(sc->malo_mh, ctx.nmc, ctx.macs);
 
 all:
 	/*