From owner-svn-src-all@freebsd.org Mon Oct 14 20:18:36 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E519D135F69; Mon, 14 Oct 2019 20:18:36 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46sVHw5VfQz3KW1; Mon, 14 Oct 2019 20:18:36 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9BDB7A759; Mon, 14 Oct 2019 20:18:36 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9EKIaXC064518; Mon, 14 Oct 2019 20:18:36 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9EKIaFu064517; Mon, 14 Oct 2019 20:18:36 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201910142018.x9EKIaFu064517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 14 Oct 2019 20:18:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353502 - head/sys/dev/mxge X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/dev/mxge X-SVN-Commit-Revision: 353502 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2019 20:18:37 -0000 Author: glebius Date: Mon Oct 14 20:18:36 2019 New Revision: 353502 URL: https://svnweb.freebsd.org/changeset/base/353502 Log: Convert to if_foreach_llmaddr() KPI. Reviewed by: gallatin Modified: head/sys/dev/mxge/if_mxge.c Modified: head/sys/dev/mxge/if_mxge.c ============================================================================== --- head/sys/dev/mxge/if_mxge.c Mon Oct 14 19:17:00 2019 (r353501) +++ head/sys/dev/mxge/if_mxge.c Mon Oct 14 20:18:36 2019 (r353502) @@ -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) {