diff options
author | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-14 20:18:36 +0000 |
---|---|---|
committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-14 20:18:36 +0000 |
commit | 2a0f8518d6aa7bd34e6289f705fec3dc68be12f9 (patch) | |
tree | 3c854e1ef207c9c9312a8e0ef48b1859dfb1582c /sys/dev/mxge | |
parent | fa14f7f1b72121a0cfe893e257223c7f4dc0130a (diff) | |
download | src-2a0f8518d6aa7bd34e6289f705fec3dc68be12f9.tar.gz src-2a0f8518d6aa7bd34e6289f705fec3dc68be12f9.zip |
Convert to if_foreach_llmaddr() KPI.
Reviewed by: gallatin
Notes
Notes:
svn path=/head/; revision=353502
Diffstat (limited to 'sys/dev/mxge')
-rw-r--r-- | sys/dev/mxge/if_mxge.c | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c index 1f8defbb576d..146d64ec188d 100644 --- a/sys/dev/mxge/if_mxge.c +++ b/sys/dev/mxge/if_mxge.c @@ -1091,12 +1091,35 @@ mxge_change_promisc(mxge_softc_t *sc, int promisc) } } +struct mxge_add_maddr_ctx { + mxge_softc_t *sc; + int error; +}; + +static u_int +mxge_add_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) +{ + struct mxge_add_maddr_ctx *ctx = arg; + mxge_cmd_t cmd; + + if (ctx->error != 0) + return (0); + bcopy(LLADDR(sdl), &cmd.data0, 4); + bcopy(LLADDR(sdl) + 4, &cmd.data1, 2); + cmd.data0 = htonl(cmd.data0); + cmd.data1 = htonl(cmd.data1); + + ctx->error = mxge_send_cmd(ctx->sc, MXGEFW_JOIN_MULTICAST_GROUP, &cmd); + + return (1); +} + static void mxge_set_multicast_list(mxge_softc_t *sc) { - mxge_cmd_t cmd; - struct ifmultiaddr *ifma; + struct mxge_add_maddr_ctx ctx; struct ifnet *ifp = sc->ifp; + mxge_cmd_t cmd; int err; /* This firmware is known to not support multicast */ @@ -1129,28 +1152,16 @@ mxge_set_multicast_list(mxge_softc_t *sc) } /* Walk the multicast list, and add each address */ - - if_maddr_rlock(ifp); - CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { - if (ifma->ifma_addr->sa_family != AF_LINK) - continue; - bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr), - &cmd.data0, 4); - bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr) + 4, - &cmd.data1, 2); - cmd.data0 = htonl(cmd.data0); - cmd.data1 = htonl(cmd.data1); - err = mxge_send_cmd(sc, MXGEFW_JOIN_MULTICAST_GROUP, &cmd); - if (err != 0) { - device_printf(sc->dev, "Failed " - "MXGEFW_JOIN_MULTICAST_GROUP, error status:" - "%d\t", err); - /* abort, leaving multicast filtering off */ - if_maddr_runlock(ifp); - return; - } + ctx.sc = sc; + ctx.error = 0; + if_foreach_llmaddr(ifp, mxge_add_maddr, &ctx); + if (ctx.error != 0) { + device_printf(sc->dev, "Failed MXGEFW_JOIN_MULTICAST_GROUP, " + "error status:" "%d\t", ctx.error); + /* abort, leaving multicast filtering off */ + return; } - if_maddr_runlock(ifp); + /* Enable multicast filtering */ err = mxge_send_cmd(sc, MXGEFW_DISABLE_ALLMULTI, &cmd); if (err != 0) { |