From nobody Tue Jan 24 20:48:25 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 4P1fFP3Vv8z3bSrW; Tue, 24 Jan 2023 20:48:25 +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 4P1fFP2Fy4z42Hw; Tue, 24 Jan 2023 20:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674593305; 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=Yef1jkUU1tiBNR8cDZ9DalXRSOadmD968LMH+oJ8a10=; b=yZtSc6tHEe0xz2V9I9zjUZnpcOm+oxVbpUJecqdIDG5g5ztr1r9vNmildJvPht+Z2oOY3w CvnQ8+QiG60gxKhwlTHGm9R5stiQiJzlJNaL/ZdFLm1y/qGzMgNRY896tZOhpMcQPg7uhX lfKPRKW9QUl2+7O6kBm8s0I6TPb01VHZVGO8TxGcLsvXotJxtJGDZ5YgVYYl1FW37oW8UJ eW9P5BSK1kkMYuIQ4zHIUyg3hwyUcOIWOq9EHPmjSChdqczZcY1ln/1HjRY57goOaqeLBt NRO7NzbK3rwK0nUgA5CjjAKCVHGKuMqqM/rCwwD62sLKX/W00KsVasqCPHguTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674593305; 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=Yef1jkUU1tiBNR8cDZ9DalXRSOadmD968LMH+oJ8a10=; b=wc4xOKXi/iaaLfTpSyMsZR1ZXJFuog/hDlwAzo0f/M/QD77a0P0MewDRH6VF+1dfYEV1As FmXzZ9CCJ4AENEGIdNH3soFBg4rwc8aQ8rPlP+nndAd9YKh7zrRX+6UK0HmFe8AHMZpCxN 7FCVyNzROSMEwY/pb1umJNjuza8S3QdWGzvPJVL9DuE/AcI4d6j9LQeMh+PAuxgt72d5Cw UbFQUYfh3sc+qvEBRHVajr2fo1BUrIJfaaH+wANcBL6MG3MhzwlztAU9wD79djQ/YkmkL4 Pxvq+2bVehDIBwQf2FRiUR4rjeo7vVZBiqxyUY3oUbD5qsCbr7h//N/I6VjA4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674593305; a=rsa-sha256; cv=none; b=IlGEPlHrHq78StJ7CuK4/3PZ2t8FBwz4Ujg2BcGAETJ4cwkcU5NdJofwag5P1113PwOoU9 1N2A2V5uj+IpEcoFsNbFCAieLtltt9nTzVnzQ9XDigtPioaizbqoj+D3ef8nnp/UeyK+1e cY0cYq2dc/iaJyTlCMd3DgKYcqLTy3Xh9WIUF1Ez3TZl1cqkFRm6M7B7IgNBVqpiPVbqfO AsmTi3Wu1m6pPOa1YORmPyY4a9gpPye/aX2OWct8nBcGcOzUyOkljafOaVbm5TqivC5mNU Ft+M0JTBcvRnSr4TWwyW29K0H31/MN+zwXkNUL10ZxYU+7qq7uSyA1u17yFQGw== 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 4P1fFP0jkfzMv0; Tue, 24 Jan 2023 20:48:25 +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 30OKmPmO053926; Tue, 24 Jan 2023 20:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OKmPvA053925; Tue, 24 Jan 2023 20:48:25 GMT (envelope-from git) Date: Tue, 24 Jan 2023 20:48:25 GMT Message-Id: <202301242048.30OKmPvA053925@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: 0083fc5c7693 - main - Mechanically convert dtsec(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: 0083fc5c76939efc6ded5415d781105aef8ed55f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=0083fc5c76939efc6ded5415d781105aef8ed55f commit 0083fc5c76939efc6ded5415d781105aef8ed55f Author: Justin Hibbits AuthorDate: 2022-08-17 20:13:23 +0000 Commit: Justin Hibbits CommitDate: 2023-01-24 20:05:28 +0000 Mechanically convert dtsec(4) to IfAPI Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D37815 --- sys/dev/dpaa/if_dtsec.c | 47 +++++++++++++++++++++++------------------------ sys/dev/dpaa/if_dtsec.h | 2 +- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/sys/dev/dpaa/if_dtsec.c b/sys/dev/dpaa/if_dtsec.c index 2c6291b07e34..cc34c2cbb416 100644 --- a/sys/dev/dpaa/if_dtsec.c +++ b/sys/dev/dpaa/if_dtsec.c @@ -392,13 +392,13 @@ dtsec_if_disable_locked(struct dtsec_softc *sc) } static int -dtsec_if_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +dtsec_if_ioctl(if_t ifp, u_long command, caddr_t data) { struct dtsec_softc *sc; struct ifreq *ifr; int error; - sc = ifp->if_softc; + sc = if_getsoftc(ifp); ifr = (struct ifreq *)data; error = 0; @@ -407,7 +407,7 @@ dtsec_if_ioctl(struct ifnet *ifp, u_long command, caddr_t data) case SIOCSIFMTU: DTSEC_LOCK(sc); if (dtsec_set_mtu(sc, ifr->ifr_mtu)) - ifp->if_mtu = ifr->ifr_mtu; + if_setmtu(ifp, ifr->ifr_mtu); else error = EINVAL; DTSEC_UNLOCK(sc); @@ -472,7 +472,7 @@ dtsec_if_init_locked(struct dtsec_softc *sc) /* Set MAC address */ error = FM_MAC_ModifyMacAddr(sc->sc_mach, - (t_EnetAddr *)IF_LLADDR(sc->sc_ifnet)); + (t_EnetAddr *)if_getlladdr(sc->sc_ifnet)); if (error != E_OK) { device_printf(sc->sc_dev, "couldn't set MAC address.\n"); goto err; @@ -513,18 +513,18 @@ dtsec_if_init(void *data) } static void -dtsec_if_start(struct ifnet *ifp) +dtsec_if_start(if_t ifp) { struct dtsec_softc *sc; - sc = ifp->if_softc; + sc = if_getsoftc(ifp); DTSEC_LOCK(sc); sc->sc_start_locked(sc); DTSEC_UNLOCK(sc); } static void -dtsec_if_watchdog(struct ifnet *ifp) +dtsec_if_watchdog(if_t ifp) { /* TODO */ } @@ -536,9 +536,9 @@ dtsec_if_watchdog(struct ifnet *ifp) * @{ */ static int -dtsec_ifmedia_upd(struct ifnet *ifp) +dtsec_ifmedia_upd(if_t ifp) { - struct dtsec_softc *sc = ifp->if_softc; + struct dtsec_softc *sc = if_getsoftc(ifp); DTSEC_LOCK(sc); mii_mediachg(sc->sc_mii); @@ -548,9 +548,9 @@ dtsec_ifmedia_upd(struct ifnet *ifp) } static void -dtsec_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) +dtsec_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) { - struct dtsec_softc *sc = ifp->if_softc; + struct dtsec_softc *sc = if_getsoftc(ifp); DTSEC_LOCK(sc); @@ -599,7 +599,7 @@ dtsec_attach(device_t dev) struct dtsec_softc *sc; device_t parent; int error; - struct ifnet *ifp; + if_t ifp; sc = device_get_softc(dev); @@ -686,13 +686,13 @@ dtsec_attach(device_t dev) return (ENOMEM); } - ifp->if_softc = sc; - ifp->if_mtu = ETHERMTU; /* TODO: Configure */ - ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST; - ifp->if_init = dtsec_if_init; - ifp->if_start = dtsec_if_start; - ifp->if_ioctl = dtsec_if_ioctl; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + if_setsoftc(ifp, sc); + + if_setflags(ifp, IFF_SIMPLEX | IFF_BROADCAST); + if_setinitfn(ifp, dtsec_if_init); + if_setstartfn(ifp, dtsec_if_start); + if_setioctlfn(ifp, dtsec_if_ioctl); + if_setsendqlen(ifp, IFQ_MAXLEN); if (sc->sc_phy_addr >= 0) if_initname(ifp, device_get_name(sc->sc_dev), @@ -702,12 +702,11 @@ dtsec_attach(device_t dev) /* TODO */ #if 0 - IFQ_SET_MAXLEN(&ifp->if_snd, TSEC_TX_NUM_DESC - 1); - ifp->if_snd.ifq_drv_maxlen = TSEC_TX_NUM_DESC - 1; - IFQ_SET_READY(&ifp->if_snd); + if_setsendqlen(ifp, TSEC_TX_NUM_DESC - 1); + if_setsendqready(ifp); #endif - ifp->if_capabilities = IFCAP_JUMBO_MTU; /* TODO: HWCSUM */ - ifp->if_capenable = ifp->if_capabilities; + + if_setcapenable(ifp, if_getcapabilities(ifp)); /* Attach PHY(s) */ error = mii_attach(sc->sc_dev, &sc->sc_mii_dev, ifp, dtsec_ifmedia_upd, diff --git a/sys/dev/dpaa/if_dtsec.h b/sys/dev/dpaa/if_dtsec.h index 609111274c0e..f9f80f141284 100644 --- a/sys/dev/dpaa/if_dtsec.h +++ b/sys/dev/dpaa/if_dtsec.h @@ -49,7 +49,7 @@ enum eth_dev_type { struct dtsec_softc { /* XXX MII bus requires that struct ifnet is first!!! */ - struct ifnet *sc_ifnet; + if_t sc_ifnet; device_t sc_dev; struct resource *sc_mem;