Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 21 Oct 2019 18:07:36 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353824 - head/sys/dev/rl
Message-ID:  <201910211807.x9LI7aVV065715@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Mon Oct 21 18:07:35 2019
New Revision: 353824
URL: https://svnweb.freebsd.org/changeset/base/353824

Log:
  Convert to if_foreach_llmaddr() KPI.

Modified:
  head/sys/dev/rl/if_rl.c

Modified: head/sys/dev/rl/if_rl.c
==============================================================================
--- head/sys/dev/rl/if_rl.c	Mon Oct 21 18:07:32 2019	(r353823)
+++ head/sys/dev/rl/if_rl.c	Mon Oct 21 18:07:35 2019	(r353824)
@@ -509,6 +509,21 @@ rl_miibus_statchg(device_t dev)
 	 */
 }
 
+static u_int
+rl_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
+{
+	uint32_t *hashes = arg;
+	int h;
+
+	h = ether_crc32_be(LLADDR(sdl), ETHER_ADDR_LEN) >> 26;
+	if (h < 32)
+		hashes[0] |= (1 << h);
+	else
+		hashes[1] |= (1 << (h - 32));
+
+	return (1);
+}
+
 /*
  * Program the 64-bit multicast hash filter.
  */
@@ -516,9 +531,7 @@ static void
 rl_rxfilter(struct rl_softc *sc)
 {
 	struct ifnet		*ifp = sc->rl_ifp;
-	int			h = 0;
 	uint32_t		hashes[2] = { 0, 0 };
-	struct ifmultiaddr	*ifma;
 	uint32_t		rxfilt;
 
 	RL_LOCK_ASSERT(sc);
@@ -539,18 +552,7 @@ rl_rxfilter(struct rl_softc *sc)
 		hashes[1] = 0xFFFFFFFF;
 	} else {
 		/* Now program new ones. */
-		if_maddr_rlock(ifp);
-		CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-			if (ifma->ifma_addr->sa_family != AF_LINK)
-				continue;
-			h = ether_crc32_be(LLADDR((struct sockaddr_dl *)
-			    ifma->ifma_addr), ETHER_ADDR_LEN) >> 26;
-			if (h < 32)
-				hashes[0] |= (1 << h);
-			else
-				hashes[1] |= (1 << (h - 32));
-		}
-		if_maddr_runlock(ifp);
+		if_foreach_llmaddr(ifp, rl_hash_maddr, hashes);
 		if (hashes[0] != 0 || hashes[1] != 0)
 			rxfilt |= RL_RXCFG_RX_MULTI;
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910211807.x9LI7aVV065715>