From nobody Tue Jan 31 21:53:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P5zMd5knwz3cPtJ; Tue, 31 Jan 2023 21:53:49 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P5zMd3dWQz3mKj; Tue, 31 Jan 2023 21:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675202029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mfa6cE5toL2CEZGNQLzdhEQiHExZubB5uedfuy26VAM=; b=sr6oy/WeC9S9E7vXsVSRswI044FievlJv10HitvaxaK5kfrO4SF3xqNmgKIorhS9zwgGKE ineUVDfbtd51d6NLjputKT1Bs8KSD0TJjeTBJEXsYOTpNx53pEyegNAP1unz6qNU3F4oiu Q79Vu8WLNrPoRkYxTZOIIRGVyMx7QnndCooOzMZLgcnYGUWSs2+ye+AQUk4/iRjT6V8BDU HalvaN2E6Hwqd/C11BCeVd+GGAktxi/t0LltO4/NLxBISU5jC3WumnhnN3uzfywENiX3F7 XTVY/SGK6Ou/HJCmS9pohDEGSpMRO/HFOzjsa4VXiRYUJRj9jj+ePjsq0fo+YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675202029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mfa6cE5toL2CEZGNQLzdhEQiHExZubB5uedfuy26VAM=; b=YQAsJ86NAxW5W8FICiRSbSvCU8GZgqoAohf1dfWgViPlc5g30ZyveUh2TMUJOnO3T9Pr74 IjR7JTGNiMWx5LRYcXJgq38v3vfGLKLC5SotcNCE1SHb+xhoWGfEe/vw9kdvR6GXMZAJwr 3iRpwynIxKKU9WUYSkv6hn7fOR8PJAKPm35zTWMqoie8f6/LaoW/En8+8izHr2Kcm4x74E XurawzjSmBO9SkJhBd1LJhDjl0XwNXqxm0HAfcYGzLXeRSyP1kMJVm6trVuHCCQUaugOmO znkG2unwAnZsh4t4FJSBw9P8lKAK4Kch1hlJjoFin6jfi1YeWb5XBYjambErfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675202029; a=rsa-sha256; cv=none; b=jGafc0m7fCLAPQWb0ijTa6+qSVcvG7dgYLY3mJVaM7cFERocXZ2mXto5G6e0mxVHWPhJG0 BAsST06DZCa7hBSMGmibWgNgeeEWitJhAl4eWLi2xTate7MplyIPm1C1HVOMeoKjklvhw3 OGwUjfRq1sIRF1MKFJ2GATxk1XLqG9v1kcMA5FM+lPdPna8KJHzf0nsX5CeMQuBqdc5m6p vNf8YGMgMfYaa9HOdy7/BEYZdeRVDLnp4a/Eqk0f4Ypo9+3GhzVSDn5AO4Cr38NfW3G2H4 +d5aSWbCsx1WqrBUyGxcWWfMQBIZeYA+l4CNk6hirEJdBjw7Dk1CEl366DTSqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P5zMd2lGwz14Zf; Tue, 31 Jan 2023 21:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30VLrnhn080724; Tue, 31 Jan 2023 21:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VLrnRH080723; Tue, 31 Jan 2023 21:53:49 GMT (envelope-from git) Date: Tue, 31 Jan 2023 21:53:49 GMT Message-Id: <202301312153.30VLrnRH080723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: b7459fb0adaf - main - Mechanically convert genet(4) to IfAPI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7459fb0adaf05268b5da9a8772a4fb0250bba65 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=b7459fb0adaf05268b5da9a8772a4fb0250bba65 commit b7459fb0adaf05268b5da9a8772a4fb0250bba65 Author: Justin Hibbits AuthorDate: 2022-08-19 16:03:42 +0000 Commit: Justin Hibbits CommitDate: 2023-01-31 21:26:34 +0000 Mechanically convert genet(4) to IfAPI Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D37832 --- sys/arm64/broadcom/genet/if_genet.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index 10ec4dde8955..1add2bb7fe3d 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -950,7 +950,7 @@ gen_setup_multi(void *arg, struct sockaddr_dl *sdl, u_int count) static void gen_setup_rxfilter(struct gen_softc *sc) { - struct ifnet *ifp = sc->ifp; + if_t ifp = sc->ifp; uint32_t cmd, mdf_ctrl; u_int n; @@ -966,17 +966,17 @@ gen_setup_rxfilter(struct gen_softc *sc) n = if_llmaddr_count(ifp) + 2; if (n > GENET_MAX_MDF_FILTER) - ifp->if_flags |= IFF_ALLMULTI; + if_setflagbits(ifp, IFF_ALLMULTI, 0); else - ifp->if_flags &= ~IFF_ALLMULTI; + if_setflagbits(ifp, 0, IFF_ALLMULTI); - if ((ifp->if_flags & (IFF_PROMISC|IFF_ALLMULTI)) != 0) { + if ((if_getflags(ifp) & (IFF_PROMISC|IFF_ALLMULTI)) != 0) { cmd |= GENET_UMAC_CMD_PROMISC; mdf_ctrl = 0; } else { cmd &= ~GENET_UMAC_CMD_PROMISC; gen_setup_rxfilter_mdf(sc, 0, ether_broadcastaddr); - gen_setup_rxfilter_mdf(sc, 1, IF_LLADDR(ifp)); + gen_setup_rxfilter_mdf(sc, 1, if_getlladdr(ifp)); (void) if_foreach_llmaddr(ifp, gen_setup_multi, sc); mdf_ctrl = (__BIT(GENET_MAX_MDF_FILTER) - 1) &~ (__BIT(GENET_MAX_MDF_FILTER - n) - 1); @@ -998,7 +998,7 @@ gen_set_enaddr(struct gen_softc *sc) ifp = sc->ifp; /* Write our unicast address */ - enaddr = IF_LLADDR(ifp); + enaddr = if_getlladdr(ifp); /* Write hardware address */ val = enaddr[3] | (enaddr[2] << 8) | (enaddr[1] << 16) | (enaddr[0] << 24); @@ -1084,7 +1084,7 @@ gen_encap(struct gen_softc *sc, struct mbuf **mp) if (m->m_len == sizeof(struct ether_header)) { m = m_pullup(m, MIN(m->m_pkthdr.len, gen_tx_hdr_min)); if (m == NULL) { - if (sc->ifp->if_flags & IFF_DEBUG) + if (if_getflags(sc->ifp) & IFF_DEBUG) device_printf(sc->dev, "header pullup fail\n"); *mp = NULL; @@ -1098,7 +1098,7 @@ gen_encap(struct gen_softc *sc, struct mbuf **mp) csumdata = m->m_pkthdr.csum_data; M_PREPEND(m, sizeof(struct statusblock), M_NOWAIT); if (m == NULL) { - if (sc->ifp->if_flags & IFF_DEBUG) + if (if_getflags(sc->ifp) & IFF_DEBUG) device_printf(sc->dev, "prepend fail\n"); *mp = NULL; return (ENOMEM); @@ -1377,7 +1377,7 @@ gen_rxintr(struct gen_softc *sc, struct rx_queue *q) (GENET_RX_DESC_STATUS_SOP | GENET_RX_DESC_STATUS_EOP | GENET_RX_DESC_STATUS_RX_ERROR)) != (GENET_RX_DESC_STATUS_SOP | GENET_RX_DESC_STATUS_EOP)) { - if (ifp->if_flags & IFF_DEBUG) + if (if_getflags(ifp) & IFF_DEBUG) device_printf(sc->dev, "error/frag %x csum %x\n", status, sb->rxcsum); @@ -1388,7 +1388,7 @@ gen_rxintr(struct gen_softc *sc, struct rx_queue *q) error = gen_newbuf_rx(sc, q, index); if (error != 0) { if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); - if (ifp->if_flags & IFF_DEBUG) + if (if_getflags(ifp) & IFF_DEBUG) device_printf(sc->dev, "gen_newbuf_rx %d\n", error); /* reuse previous mbuf */