diff options
author | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-14 20:33:14 +0000 |
---|---|---|
committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-14 20:33:14 +0000 |
commit | 96b224ed248a871c14892166b85df60b9bc5f972 (patch) | |
tree | f620cf67b1fba2e0e71d7194a1b173463c0b9a55 /sys/dev/sfxge | |
parent | 9b64a6db64918fc7c224af43e7f2ffa8583b6d34 (diff) | |
download | src-96b224ed248a871c14892166b85df60b9bc5f972.tar.gz src-96b224ed248a871c14892166b85df60b9bc5f972.zip |
Convert to if_foreach_llmaddr() KPI.
Reviewed by: philip
Notes
Notes:
svn path=/head/; revision=353520
Diffstat (limited to 'sys/dev/sfxge')
-rw-r--r-- | sys/dev/sfxge/sfxge_port.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sys/dev/sfxge/sfxge_port.c b/sys/dev/sfxge/sfxge_port.c index 08305a9b4753..3407a176d863 100644 --- a/sys/dev/sfxge/sfxge_port.c +++ b/sys/dev/sfxge/sfxge_port.c @@ -358,36 +358,35 @@ done: SFXGE_PORT_UNLOCK(port); } +static u_int +sfxge_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) +{ + uint8_t *mcast_addr = arg; + + if (cnt == EFX_MAC_MULTICAST_LIST_MAX) + return (0); + + memcpy(mcast_addr + (cnt * EFX_MAC_ADDR_LEN), LLADDR(sdl), + EFX_MAC_ADDR_LEN); + + return (1); +} + static int sfxge_mac_multicast_list_set(struct sfxge_softc *sc) { struct ifnet *ifp = sc->ifnet; struct sfxge_port *port = &sc->port; - uint8_t *mcast_addr = port->mcast_addrs; - struct ifmultiaddr *ifma; - struct sockaddr_dl *sa; int rc = 0; mtx_assert(&port->lock, MA_OWNED); - port->mcast_count = 0; - if_maddr_rlock(ifp); - CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { - if (ifma->ifma_addr->sa_family == AF_LINK) { - if (port->mcast_count == EFX_MAC_MULTICAST_LIST_MAX) { - device_printf(sc->dev, - "Too many multicast addresses\n"); - rc = EINVAL; - break; - } - - sa = (struct sockaddr_dl *)ifma->ifma_addr; - memcpy(mcast_addr, LLADDR(sa), EFX_MAC_ADDR_LEN); - mcast_addr += EFX_MAC_ADDR_LEN; - ++port->mcast_count; - } + port->mcast_count = if_foreach_llmaddr(ifp, sfxge_copy_maddr, + port->mcast_addrs); + if (port->mcast_count == EFX_MAC_MULTICAST_LIST_MAX) { + device_printf(sc->dev, "Too many multicast addresses\n"); + rc = EINVAL; } - if_maddr_runlock(ifp); if (rc == 0) { rc = efx_mac_multicast_list_set(sc->enp, port->mcast_addrs, @@ -485,6 +484,7 @@ int sfxge_port_start(struct sfxge_softc *sc) { uint8_t mac_addr[ETHER_ADDR_LEN]; + struct epoch_tracker et; struct ifnet *ifp = sc->ifnet; struct sfxge_port *port; efx_nic_t *enp; @@ -518,10 +518,10 @@ sfxge_port_start(struct sfxge_softc *sc) goto fail3; /* Set the unicast address */ - if_addr_rlock(ifp); + NET_EPOCH_ENTER(et); bcopy(LLADDR((struct sockaddr_dl *)ifp->if_addr->ifa_addr), mac_addr, sizeof(mac_addr)); - if_addr_runlock(ifp); + NET_EPOCH_EXIT(et); if ((rc = efx_mac_addr_set(enp, mac_addr)) != 0) goto fail4; |