Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 14 Oct 2019 20:29:15 +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: r353508 - head/sys/dev/usb/net
Message-ID:  <201910142029.x9EKTFB9070416@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Mon Oct 14 20:29:14 2019
New Revision: 353508
URL: https://svnweb.freebsd.org/changeset/base/353508

Log:
  Convert to if_foreach_llmaddr() KPI.
  
  Reviewed by:	hselasky

Modified:
  head/sys/dev/usb/net/if_ure.c

Modified: head/sys/dev/usb/net/if_ure.c
==============================================================================
--- head/sys/dev/usb/net/if_ure.c	Mon Oct 14 20:26:53 2019	(r353507)
+++ head/sys/dev/usb/net/if_ure.c	Mon Oct 14 20:29:14 2019	(r353508)
@@ -792,6 +792,19 @@ ure_tick(struct usb_ether *ue)
 	}
 }
 
+static u_int
+ure_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
+{
+	uint32_t h, *hashes = arg;
+
+	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.
  */
@@ -800,9 +813,8 @@ ure_rxfilter(struct usb_ether *ue)
 {
 	struct ure_softc *sc = uether_getsc(ue);
 	struct ifnet *ifp = uether_getifp(ue);
-	struct ifmultiaddr *ifma;
-	uint32_t h, rxmode;
-	uint32_t hashes[2] = { 0, 0 };
+	uint32_t rxmode;
+	uint32_t h, hashes[2] = { 0, 0 };
 
 	URE_LOCK_ASSERT(sc, MA_OWNED);
 
@@ -818,18 +830,7 @@ ure_rxfilter(struct usb_ether *ue)
 	}
 
 	rxmode |= URE_RCR_AM;
-	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, ure_hash_maddr, &hashes);
 
 	h = bswap32(hashes[0]);
 	hashes[0] = bswap32(hashes[1]);

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