From nobody Tue Feb 14 15:36:15 2023 X-Original-To: dev-commits-src-main@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 4PGQKW60j3z3s50r; Tue, 14 Feb 2023 15:36:15 +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 4PGQKW4Xppz4L05; Tue, 14 Feb 2023 15:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388975; 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=1g2Izz3yCTk/lO3HBUr6PBr4odP7x69hAp8HTkDawJ0=; b=s/TthmHD2K4kAh0pImahw2soTBSNOoFZsutz8MrWK982GxVxRnuooqBnolY66yEsyIrmnv YNDjzWXF7+283rB4Wrthn59b4H/wlqV30WFrZBFtQhuwUnL13Uy1qCEZCpU9gw8mGj6gU0 gH+M9moUXIo+ri99vRkZUvktBFoh824LytwXcw7eYVJ5ouS51tbY/0NmVRqfwmKaZY9Kgi yqoNFlqQrZz4d6h7ed1mkQtfGjRKNJzaRQrbGggIwiLaUyggOMBxr4xzpQlGJNz6cdwWBr g84k8xiEWAcWlJk9r1tI/N5U900SHyc0rsg0cCGh54tRN5um/7QgqHsZczq7Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388975; 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=1g2Izz3yCTk/lO3HBUr6PBr4odP7x69hAp8HTkDawJ0=; b=DV+N8LVvtJ+VcAlBiZdq9SvWJr6tRIE7FyobGuw98+E7uvMciAO7GzSDgc8YIoe0pxNHIq iro3WuPmWE5WC3aEZBFo2dTkCvTMNyI0USD7LMGVewai+Ue53vaTn+6jA0vyRjNTxQYAw9 SSIvCiT8PRO4bKGZuihjzcH73dro3wxVWqxY+9I/WDpUuxliRv/ODXwSz/5TVTYb5fUpoC AvqtQcfTQ7xaTk2C+zAc91S9c/UvpRzD1duueMH9FArcrf93rm/NTYnTie9N/AlLwyjEcs yG1M2zU5ZWN+awmsmgfiFvIGA9Wkjl1Pp75SKKgRbG4jxg4smm4eseQJku0UkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676388975; a=rsa-sha256; cv=none; b=qBTGD0ExQ5qgzIbZNowXGKe2CueVAAtHeXfkP4PedcU62bFINc+f57pOyQVqS5D6qCZdRK vNG3nxwPPhMQwQ4NUBdmYdxoeZAUSojB1yYG0rgIIuSdNuPrfVcljk/RxRnAyCgGFcxQS3 CCpcI2hbFz/6L4IcNooTMY9MfLnabOz12oneIEYErLBnP9XGR0Dja6VTSuUjenvV4yMBm3 E4OLJiHyGJQY4RetF0aBhCS2cUNfEJgEY82DjBuj6b7vkGPfFFWlgYrATKa9QepdKFAswG snISApheOMARSimGWOdhdqwRZMxoxsD27YXop/czPzb6rec3gUF13iQPwU7agg== 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 4PGQKW3b3rz148j; Tue, 14 Feb 2023 15:36:15 +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 31EFaFv5043630; Tue, 14 Feb 2023 15:36:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EFaFvX043629; Tue, 14 Feb 2023 15:36:15 GMT (envelope-from git) Date: Tue, 14 Feb 2023 15:36:15 GMT Message-Id: <202302141536.31EFaFvX043629@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: b29549c7f939 - main - etherswitch: Fix leftovers from IfAPI conversion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b29549c7f939ec93cae1bac115b0010e07538573 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=b29549c7f939ec93cae1bac115b0010e07538573 commit b29549c7f939ec93cae1bac115b0010e07538573 Author: Justin Hibbits AuthorDate: 2023-02-10 14:57:29 +0000 Commit: Justin Hibbits CommitDate: 2023-02-14 15:21:18 +0000 etherswitch: Fix leftovers from IfAPI conversion Sponsored by: Juniper Networks, Inc. --- sys/dev/etherswitch/ar40xx/ar40xx_phy.c | 8 ++++---- sys/dev/etherswitch/e6000sw/e6060sw.c | 4 ++-- sys/dev/etherswitch/felix/felix.c | 4 ++-- sys/dev/etherswitch/infineon/adm6996fc.c | 4 ++-- sys/dev/etherswitch/micrel/ksz8995ma.c | 4 ++-- sys/dev/etherswitch/mtkswitch/mtkswitch.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c index 581eead59bfd..03dad3a8fc04 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c @@ -162,10 +162,10 @@ static int ar40xx_ifmedia_upd(if_t ifp) { struct ar40xx_softc *sc = if_getsoftc(ifp); - struct mii_data *mii = ar40xx_phy_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + struct mii_data *mii = ar40xx_phy_miiforport(sc, if_getdunit(ifp)); AR40XX_DPRINTF(sc, AR40XX_DBG_PORT_STATUS, "%s: called, PHY %d\n", - __func__, ifp->if_dunit); /* XXX - DRVAPI */ + __func__, if_getdunit(ifp)); if (mii == NULL) return (ENXIO); @@ -177,10 +177,10 @@ static void ar40xx_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) { struct ar40xx_softc *sc = if_getsoftc(ifp); - struct mii_data *mii = ar40xx_phy_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + struct mii_data *mii = ar40xx_phy_miiforport(sc, if_getdunit(ifp)); AR40XX_DPRINTF(sc, AR40XX_DBG_PORT_STATUS, "%s: called, PHY %d\n", - __func__, ifp->if_dunit); /* XXX - DRVAPI */ + __func__, if_getdunit(ifp)); if (mii == NULL) return; diff --git a/sys/dev/etherswitch/e6000sw/e6060sw.c b/sys/dev/etherswitch/e6000sw/e6060sw.c index f21b7d2c24d0..8ebbb7e7016a 100644 --- a/sys/dev/etherswitch/e6000sw/e6060sw.c +++ b/sys/dev/etherswitch/e6000sw/e6060sw.c @@ -889,7 +889,7 @@ e6060sw_ifmedia_upd(if_t ifp) struct mii_data *mii; sc = if_getsoftc(ifp); - mii = e6060sw_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = e6060sw_miiforport(sc, if_getdunit(ifp)); DPRINTF(sc->sc_dev, "%s\n", __func__); if (mii == NULL) @@ -905,7 +905,7 @@ e6060sw_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) struct mii_data *mii; sc = if_getsoftc(ifp); - mii = e6060sw_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = e6060sw_miiforport(sc, if_getdunit(ifp)); DPRINTF(sc->sc_dev, "%s\n", __func__); diff --git a/sys/dev/etherswitch/felix/felix.c b/sys/dev/etherswitch/felix/felix.c index 5a08da8fb1ff..fe07cb834be3 100644 --- a/sys/dev/etherswitch/felix/felix.c +++ b/sys/dev/etherswitch/felix/felix.c @@ -970,7 +970,7 @@ felix_ifmedia_upd(if_t ifp) felix_softc_t sc; sc = if_getsoftc(ifp); - mii = felix_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = felix_miiforport(sc, if_getdunit(ifp)); if (mii == NULL) return (ENXIO); @@ -985,7 +985,7 @@ felix_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) struct mii_data *mii; sc = if_getsoftc(ifp); - mii = felix_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = felix_miiforport(sc, if_getdunit(ifp)); if (mii == NULL) return; diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c index 7b3c97a99303..e6345629bbc4 100644 --- a/sys/dev/etherswitch/infineon/adm6996fc.c +++ b/sys/dev/etherswitch/infineon/adm6996fc.c @@ -727,7 +727,7 @@ adm6996fc_ifmedia_upd(if_t ifp) struct mii_data *mii; sc = if_getsoftc(ifp); - mii = adm6996fc_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = adm6996fc_miiforport(sc, if_getdunit(ifp)); DPRINTF(sc->sc_dev, "%s\n", __func__); if (mii == NULL) @@ -743,7 +743,7 @@ adm6996fc_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) struct mii_data *mii; sc = if_getsoftc(ifp); - mii = adm6996fc_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = adm6996fc_miiforport(sc, if_getdunit(ifp)); DPRINTF(sc->sc_dev, "%s\n", __func__); diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c index 6b7bbb3da767..f4f6fa6a127a 100644 --- a/sys/dev/etherswitch/micrel/ksz8995ma.c +++ b/sys/dev/etherswitch/micrel/ksz8995ma.c @@ -777,7 +777,7 @@ ksz8995ma_ifmedia_upd(if_t ifp) struct mii_data *mii; sc = if_getsoftc(ifp); - mii = ksz8995ma_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = ksz8995ma_miiforport(sc, if_getdunit(ifp)); DPRINTF(sc->sc_dev, "%s\n", __func__); if (mii == NULL) @@ -793,7 +793,7 @@ ksz8995ma_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) struct mii_data *mii; sc = if_getsoftc(ifp); - mii = ksz8995ma_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + mii = ksz8995ma_miiforport(sc, if_getdunit(ifp)); DPRINTF(sc->sc_dev, "%s\n", __func__); diff --git a/sys/dev/etherswitch/mtkswitch/mtkswitch.c b/sys/dev/etherswitch/mtkswitch/mtkswitch.c index c10c34c4c21c..d8a474e54c91 100644 --- a/sys/dev/etherswitch/mtkswitch/mtkswitch.c +++ b/sys/dev/etherswitch/mtkswitch/mtkswitch.c @@ -522,7 +522,7 @@ static int mtkswitch_ifmedia_upd(if_t ifp) { struct mtkswitch_softc *sc = if_getsoftc(ifp); - struct mii_data *mii = mtkswitch_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + struct mii_data *mii = mtkswitch_miiforport(sc, if_getdunit(ifp)); if (mii == NULL) return (ENXIO); @@ -534,7 +534,7 @@ static void mtkswitch_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) { struct mtkswitch_softc *sc = if_getsoftc(ifp); - struct mii_data *mii = mtkswitch_miiforport(sc, ifp->if_dunit); /* XXX - DRVAPI */ + struct mii_data *mii = mtkswitch_miiforport(sc, if_getdunit(ifp)); DPRINTF(sc->sc_dev, "%s\n", __func__);