mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-12 09:58:36 +00:00
Code Issues Releases Activity

Convert to if_foreach_llmaddr() KPI.

Browse Source
This commit is contained in:
Gleb Smirnoff 2019-10-21 18:07:35 +00:00
parent 307b050d3b
commit a51cd4c558
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=353824
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/dev/rl/if_rl.c
View File

@ -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. * Program the 64-bit multicast hash filter.
*/ */
@ -516,9 +531,7 @@ static void
rl_rxfilter(struct rl_softc *sc) rl_rxfilter(struct rl_softc *sc)
{ {
struct ifnet *ifp = sc->rl_ifp; struct ifnet *ifp = sc->rl_ifp;
int h = 0;
uint32_t hashes[2] = { 0, 0 }; uint32_t hashes[2] = { 0, 0 };
struct ifmultiaddr *ifma;
uint32_t rxfilt; uint32_t rxfilt;
RL_LOCK_ASSERT(sc); RL_LOCK_ASSERT(sc);
@ -539,18 +552,7 @@ rl_rxfilter(struct rl_softc *sc)
hashes[1] = 0xFFFFFFFF; hashes[1] = 0xFFFFFFFF;
} else { } else {
/* Now program new ones. */ /* Now program new ones. */
if_maddr_rlock(ifp); if_foreach_llmaddr(ifp, rl_hash_maddr, hashes);
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 (hashes[0] != 0 || hashes[1] != 0) if (hashes[0] != 0 || hashes[1] != 0)
rxfilt |= RL_RXCFG_RX_MULTI; rxfilt |= RL_RXCFG_RX_MULTI;
} }