Date: Tue, 14 Feb 2023 15:36:15 GMT From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b29549c7f939 - main - etherswitch: Fix leftovers from IfAPI conversion Message-ID: <202302141536.31EFaFvX043629@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=b29549c7f939ec93cae1bac115b0010e07538573 commit b29549c7f939ec93cae1bac115b0010e07538573 Author: Justin Hibbits <jhibbits@FreeBSD.org> AuthorDate: 2023-02-10 14:57:29 +0000 Commit: Justin Hibbits <jhibbits@FreeBSD.org> 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__);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302141536.31EFaFvX043629>