Author: glebius
Date: Mon Oct 21 18:12:12 2019
New Revision: 353854
URL: https://svnweb.freebsd.org/changeset/base/353854
Log:
Convert to if_foreach_llmaddr() KPI.
Modified:
head/sys/dev/qlnx/qlnxe/qlnx_os.c
Modified: head/sys/dev/qlnx/qlnxe/qlnx_os.c
==============================================================================
--- head/sys/dev/qlnx/qlnxe/qlnx_os.c Mon Oct 21 18:12:07 2019
(r353853)
+++ head/sys/dev/qlnx/qlnxe/qlnx_os.c Mon Oct 21 18:12:12 2019
(r353854)
@@ -2644,42 +2644,36 @@ qlnx_hw_set_multi(qlnx_host_t *ha, uint8_t *mta, uint3
}
-#define QLNX_MCAST_ADDRS_SIZE (QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_HDR_LEN)
-static int
-qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi)
+static u_int
+qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt)
{
- uint8_t mta[QLNX_MCAST_ADDRS_SIZE];
- struct ifmultiaddr *ifma;
- int mcnt = 0;
- struct ifnet *ifp = ha->ifp;
- int ret = 0;
+ uint8_t *mta = arg;
- if (qlnx_vf_device(ha) == 0)
+ if (mcnt == QLNX_MAX_NUM_MULTICAST_ADDRS)
return (0);
- if_maddr_rlock(ifp);
+ bcopy(LLADDR(sdl), &mta[mcnt * ETHER_HDR_LEN], ETHER_HDR_LEN);
- CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
+ return (1);
+}
- if (ifma->ifma_addr->sa_family != AF_LINK)
- continue;
+static int
+qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi)
+{
+ uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_HDR_LEN];
+ struct ifnet *ifp = ha->ifp;
+ u_int mcnt;
- if (mcnt == QLNX_MAX_NUM_MULTICAST_ADDRS)
- break;
+ if (qlnx_vf_device(ha) == 0)
+ return (0);
- bcopy(LLADDR((struct sockaddr_dl *) ifma->ifma_addr),
- &mta[mcnt * ETHER_HDR_LEN], ETHER_HDR_LEN);
+ mcnt = if_foreach_llmaddr(ifp, qlnx_copy_maddr, mta);
- mcnt++;
- }
-
- if_maddr_runlock(ifp);
-
QLNX_LOCK(ha);
qlnx_hw_set_multi(ha, mta, mcnt, add_multi);
QLNX_UNLOCK(ha);
- return (ret);
+ return (0);
}
static int
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
