diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2019-05-29 06:17:27 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2019-05-29 06:17:27 +0000 |
| commit | 2eddf0b3a0608ccd98d38ea4c178ef766df2f3d4 (patch) | |
| tree | b093d5f466a6dec784022f45e7f277ee5407be6d /sys/dev | |
| parent | 70103da96de8e10420517cde8e57566af5bd2564 (diff) | |
No functional change:
- Simplify MII structure initialization and reference.
- KNF
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/ax88190.c | 26 | ||||
| -rw-r--r-- | sys/dev/ic/dl10019.c | 25 | ||||
| -rw-r--r-- | sys/dev/ic/elink3.c | 73 | ||||
| -rw-r--r-- | sys/dev/pci/if_tlp_pci.c | 49 |
4 files changed, 87 insertions, 86 deletions
diff --git a/sys/dev/ic/ax88190.c b/sys/dev/ic/ax88190.c index 9303bfd2045..53cb5000de4 100644 --- a/sys/dev/ic/ax88190.c +++ b/sys/dev/ic/ax88190.c @@ -1,4 +1,4 @@ -/* $NetBSD: ax88190.c,v 1.14 2019/05/29 05:06:40 msaitoh Exp $ */ +/* $NetBSD: ax88190.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.14 2019/05/29 05:06:40 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -84,23 +84,23 @@ void ax88190_media_init(struct dp8390_softc *sc) { struct ifnet *ifp = &sc->sc_ec.ec_if; + struct mii_data *mii = &sc->sc_mii; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = ax88190_mii_readreg; - sc->sc_mii.mii_writereg = ax88190_mii_writereg; - sc->sc_mii.mii_statchg = ax88190_mii_statchg; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, dp8390_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = ax88190_mii_readreg; + mii->mii_writereg = ax88190_mii_writereg; + mii->mii_statchg = ax88190_mii_statchg; + ifmedia_init(&mii->mii_media, IFM_IMASK, dp8390_mediachange, dp8390_mediastatus); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, - NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } void diff --git a/sys/dev/ic/dl10019.c b/sys/dev/ic/dl10019.c index 2bd6ddd5bfe..baae9ea7947 100644 --- a/sys/dev/ic/dl10019.c +++ b/sys/dev/ic/dl10019.c @@ -1,4 +1,4 @@ -/* $NetBSD: dl10019.c,v 1.13 2019/01/22 03:42:26 msaitoh Exp $ */ +/* $NetBSD: dl10019.c,v 1.14 2019/05/29 06:17:28 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dl10019.c,v 1.13 2019/01/22 03:42:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dl10019.c,v 1.14 2019/05/29 06:17:28 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -117,24 +117,25 @@ void dl10019_media_init(struct dp8390_softc *sc) { struct ifnet *ifp = &sc->sc_ec.ec_if; + struct mii_data *mii = &sc->sc_mii; - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = dl10019_mii_readreg; - sc->sc_mii.mii_writereg = dl10019_mii_writereg; - sc->sc_mii.mii_statchg = dl10019_mii_statchg; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, dp8390_mediachange, + mii->mii_ifp = ifp; + mii->mii_readreg = dl10019_mii_readreg; + mii->mii_writereg = dl10019_mii_writereg; + mii->mii_statchg = dl10019_mii_statchg; + ifmedia_init(&mii->mii_media, IFM_IMASK, dp8390_mediachange, dp8390_mediastatus); dl10019_mii_reset(sc); - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE); } else - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO); } void diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index 4a2913ddb0e..9afd3dfc88e 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $NetBSD: elink3.c,v 1.148 2019/05/24 06:26:38 msaitoh Exp $ */ +/* $NetBSD: elink3.c,v 1.149 2019/05/29 06:17:28 msaitoh Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.148 2019/05/24 06:26:38 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.149 2019/05/29 06:17:28 msaitoh Exp $"); #include "opt_inet.h" @@ -135,23 +135,23 @@ struct ep_media { * MII and real PHYs attached; no `native' media. */ const struct ep_media ep_vortex_media[] = { - { ELINK_PCI_10BASE_T, "10baseT", IFM_ETHER|IFM_10_T, + { ELINK_PCI_10BASE_T, "10baseT", IFM_ETHER | IFM_10_T, ELINKMEDIA_10BASE_T }, - { ELINK_PCI_10BASE_T, "10baseT-FDX", IFM_ETHER|IFM_10_T|IFM_FDX, + { ELINK_PCI_10BASE_T, "10baseT-FDX", IFM_ETHER | IFM_10_T | IFM_FDX, ELINKMEDIA_10BASE_T }, - { ELINK_PCI_AUI, "10base5", IFM_ETHER|IFM_10_5, + { ELINK_PCI_AUI, "10base5", IFM_ETHER | IFM_10_5, ELINKMEDIA_AUI }, - { ELINK_PCI_BNC, "10base2", IFM_ETHER|IFM_10_2, + { ELINK_PCI_BNC, "10base2", IFM_ETHER | IFM_10_2, ELINKMEDIA_10BASE_2 }, - { ELINK_PCI_100BASE_TX, "100baseTX", IFM_ETHER|IFM_100_TX, + { ELINK_PCI_100BASE_TX, "100baseTX", IFM_ETHER | IFM_100_TX, ELINKMEDIA_100BASE_TX }, - { ELINK_PCI_100BASE_TX, "100baseTX-FDX",IFM_ETHER|IFM_100_TX|IFM_FDX, + { ELINK_PCI_100BASE_TX, "100baseTX-FDX",IFM_ETHER | IFM_100_TX|IFM_FDX, ELINKMEDIA_100BASE_TX }, - { ELINK_PCI_100BASE_FX, "100baseFX", IFM_ETHER|IFM_100_FX, + { ELINK_PCI_100BASE_FX, "100baseFX", IFM_ETHER | IFM_100_FX, ELINKMEDIA_100BASE_FX }, - { ELINK_PCI_100BASE_MII,"manual", IFM_ETHER|IFM_MANUAL, + { ELINK_PCI_100BASE_MII,"manual", IFM_ETHER | IFM_MANUAL, ELINKMEDIA_MII }, - { ELINK_PCI_100BASE_T4, "100baseT4", IFM_ETHER|IFM_100_T4, + { ELINK_PCI_100BASE_T4, "100baseT4", IFM_ETHER | IFM_100_T4, ELINKMEDIA_100BASE_T4 }, { 0, NULL, 0, 0 }, @@ -162,11 +162,11 @@ const struct ep_media ep_vortex_media[] = { * in the 3c509, 3c579, and 3c589. */ const struct ep_media ep_509_media[] = { - { ELINK_W0_CC_UTP, "10baseT", IFM_ETHER|IFM_10_T, + { ELINK_W0_CC_UTP, "10baseT", IFM_ETHER | IFM_10_T, ELINKMEDIA_10BASE_T }, - { ELINK_W0_CC_AUI, "10base5", IFM_ETHER|IFM_10_5, + { ELINK_W0_CC_AUI, "10base5", IFM_ETHER | IFM_10_5, ELINKMEDIA_AUI }, - { ELINK_W0_CC_BNC, "10base2", IFM_ETHER|IFM_10_2, + { ELINK_W0_CC_BNC, "10base2", IFM_ETHER | IFM_10_2, ELINKMEDIA_10BASE_2 }, { 0, NULL, 0, 0 }, @@ -319,6 +319,7 @@ epconfig(struct ep_softc *sc, u_short chipset, u_int8_t *enaddr) struct ifnet *ifp = &sc->sc_ethercom.ec_if; bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; + struct mii_data *mii = &sc->sc_mii; u_int16_t i; u_int8_t myla[ETHER_ADDR_LEN]; @@ -426,12 +427,12 @@ epconfig(struct ep_softc *sc, u_short chipset, u_int8_t *enaddr) * Initialize our media structures and MII info. We'll * probe the MII if we discover that we have one. */ - sc->sc_mii.mii_ifp = ifp; - sc->sc_mii.mii_readreg = ep_mii_readreg; - sc->sc_mii.mii_writereg = ep_mii_writereg; - sc->sc_mii.mii_statchg = ep_statchg; - sc->sc_ethercom.ec_mii = &sc->sc_mii; - ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ep_media_change, + mii->mii_ifp = ifp; + mii->mii_readreg = ep_mii_readreg; + mii->mii_writereg = ep_mii_writereg; + mii->mii_statchg = ep_statchg; + sc->sc_ethercom.ec_mii = mii; + ifmedia_init(&mii->mii_media, IFM_IMASK, ep_media_change, ep_media_status); /* @@ -459,16 +460,16 @@ epconfig(struct ep_softc *sc, u_short chipset, u_int8_t *enaddr) * we don't, just treat the Boomerang like the Vortex. */ if (sc->ep_flags & ELINK_FLAGS_MII) { - mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, + mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY, 0); - if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) { - ifmedia_add(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_NONE); + if (LIST_FIRST(&mii->mii_phys) == NULL) { + ifmedia_add(&mii->mii_media, + IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(&mii->mii_media, + IFM_ETHER | IFM_NONE); } else { - ifmedia_set(&sc->sc_mii.mii_media, - IFM_ETHER|IFM_AUTO); + ifmedia_set(&mii->mii_media, + IFM_ETHER | IFM_AUTO); } break; } @@ -573,8 +574,8 @@ ep_509_probemedia(struct ep_softc *sc) /* Sanity check that there are any media! */ if ((ep_w0_config & ELINK_W0_CC_MEDIAMASK) == 0) { aprint_error("no media present!\n"); - ifmedia_add(ifm, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(ifm, IFM_ETHER|IFM_NONE); + ifmedia_add(ifm, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(ifm, IFM_ETHER | IFM_NONE); return; } @@ -644,8 +645,8 @@ ep_vortex_probemedia(struct ep_softc *sc) /* Sanity check that there are any media! */ if ((reset_options & ELINK_PCI_MEDIAMASK) == 0) { aprint_error("no media present!\n"); - ifmedia_add(ifm, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(ifm, IFM_ETHER|IFM_NONE); + ifmedia_add(ifm, IFM_ETHER | IFM_NONE, 0, NULL); + ifmedia_set(ifm, IFM_ETHER | IFM_NONE); return; } @@ -878,16 +879,16 @@ ep_roadrunner_mii_enable(struct ep_softc *sc) GO_WINDOW(3); bus_space_write_2(iot, ioh, ELINK_W3_RESET_OPTIONS, - ELINK_PCI_100BASE_MII|ELINK_RUNNER_ENABLE_MII); + ELINK_PCI_100BASE_MII | ELINK_RUNNER_ENABLE_MII); delay(1000); bus_space_write_2(iot, ioh, ELINK_W3_RESET_OPTIONS, - ELINK_PCI_100BASE_MII|ELINK_RUNNER_MII_RESET| + ELINK_PCI_100BASE_MII | ELINK_RUNNER_MII_RESET | ELINK_RUNNER_ENABLE_MII); ep_reset_cmd(sc, ELINK_COMMAND, TX_RESET); ep_reset_cmd(sc, ELINK_COMMAND, RX_RESET); delay(1000); bus_space_write_2(iot, ioh, ELINK_W3_RESET_OPTIONS, - ELINK_PCI_100BASE_MII|ELINK_RUNNER_ENABLE_MII); + ELINK_PCI_100BASE_MII | ELINK_RUNNER_ENABLE_MII); } /* @@ -1046,7 +1047,7 @@ ep_media_status(struct ifnet *ifp, struct ifmediareq *req) bus_space_handle_t ioh = sc->sc_ioh; if (sc->enabled == 0) { - req->ifm_active = IFM_ETHER|IFM_NONE; + req->ifm_active = IFM_ETHER | IFM_NONE; req->ifm_status = 0; return; } diff --git a/sys/dev/pci/if_tlp_pci.c b/sys/dev/pci/if_tlp_pci.c index 8a58ac6ceee..371cbafece0 100644 --- a/sys/dev/pci/if_tlp_pci.c +++ b/sys/dev/pci/if_tlp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tlp_pci.c,v 1.125 2018/12/09 11:14:02 jdolecek Exp $ */ +/* $NetBSD: if_tlp_pci.c,v 1.126 2019/05/29 06:17:28 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.125 2018/12/09 11:14:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.126 2019/05/29 06:17:28 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -509,9 +509,9 @@ tlp_pci_attach(device_t parent, device_t self, void *aux) * Clear the "sleep mode" bit in the CFDA register. */ reg = pci_conf_read(pc, pa->pa_tag, TULIP_PCI_CFDA); - if (reg & (CFDA_SLEEP|CFDA_SNOOZE)) + if (reg & (CFDA_SLEEP | CFDA_SNOOZE)) pci_conf_write(pc, pa->pa_tag, TULIP_PCI_CFDA, - reg & ~(CFDA_SLEEP|CFDA_SNOOZE)); + reg & ~(CFDA_SLEEP | CFDA_SNOOZE)); break; default: @@ -534,7 +534,7 @@ tlp_pci_attach(device_t parent, device_t self, void *aux) PCI_MAPREG_TYPE_IO, 0, &iot, &ioh, NULL, &iosize) == 0); memh_valid = (pci_mapreg_map(pa, TULIP_PCI_MMBA, - PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0, + PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, NULL, &memsize) == 0); if (memh_valid) { sc->sc_st = memt; @@ -652,7 +652,7 @@ tlp_pci_attach(device_t parent, device_t self, void *aux) sc->sc_srom_addrbits = 6; sc->sc_srom = malloc(TULIP_ROM_SIZE(6), M_DEVBUF, - M_NOWAIT|M_ZERO); + M_NOWAIT | M_ZERO); memcpy(sc->sc_srom, enaddr, sizeof(enaddr)); if (tlp_srom_debug) { aprint_normal("SROM CONTENTS:"); @@ -1274,7 +1274,7 @@ tlp_pci_cogent_21040_quirks(struct tulip_pci_softc *psc, const uint8_t *enaddr) { strcpy(psc->sc_tulip.sc_name, "Cogent multi-port"); - psc->sc_flags |= TULIP_PCI_SHAREDINTR|TULIP_PCI_SHAREDROM; + psc->sc_flags |= TULIP_PCI_SHAREDINTR | TULIP_PCI_SHAREDROM; } static void @@ -1388,6 +1388,7 @@ static void tlp_smc9332dst_tmsw_init(struct tulip_softc *sc) { struct tulip_21x4x_media *tm; + struct mii_data *mii = &sc->sc_mii; const char *sep = ""; uint32_t reg; int i, cnt; @@ -1396,15 +1397,14 @@ tlp_smc9332dst_tmsw_init(struct tulip_softc *sc) sc->sc_opmode = OPMODE_MBO | OPMODE_PS; TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode); - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); aprint_normal_dev(sc->sc_dev, ""); #define ADD(m, c) \ - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); \ + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); \ tm->tm_opmode = (c); \ tm->tm_gpdata = GPP_SMC9332DST_INIT; \ - ifmedia_add(&sc->sc_mii.mii_media, (m), 0, tm) + ifmedia_add(&mii->mii_media, (m), 0, tm) #define PRINT(str) aprint_normal("%s%s", sep, str); sep = ", " ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, 0), OPMODE_TTM); @@ -1448,18 +1448,17 @@ tlp_smc9332dst_tmsw_init(struct tulip_softc *sc) } delay(1000); } - if (cnt > 100) { - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_TX); - } else { - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_10_T); - } + if (cnt > 100) + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_100_TX); + else + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_T); } static void tlp_pci_vpc_21140_quirks(struct tulip_pci_softc *psc, const uint8_t *enaddr) { struct tulip_softc *sc = &psc->sc_tulip; - char *p1 = (char *) &sc->sc_srom[32]; + char *p1 = (char *)&sc->sc_srom[32]; char *p2 = &sc->sc_name[0]; do { @@ -1583,7 +1582,7 @@ tlp_pci_adaptec_quirks(struct tulip_pci_softc *psc, const uint8_t *enaddr) case 0x2400: strcpy(psc->sc_tulip.sc_name, "Adaptec ANA-6944A"); - psc->sc_flags |= TULIP_PCI_SHAREDINTR|TULIP_PCI_SHAREDROM; + psc->sc_flags |= TULIP_PCI_SHAREDINTR | TULIP_PCI_SHAREDROM; break; case 0x2b00: @@ -1592,7 +1591,7 @@ tlp_pci_adaptec_quirks(struct tulip_pci_softc *psc, const uint8_t *enaddr) case 0x3000: strcpy(psc->sc_tulip.sc_name, "Adaptec ANA-6922"); - psc->sc_flags |= TULIP_PCI_SHAREDINTR|TULIP_PCI_SHAREDROM; + psc->sc_flags |= TULIP_PCI_SHAREDINTR | TULIP_PCI_SHAREDROM; break; default: @@ -1606,21 +1605,21 @@ static void tlp_cogent_em1x0_tmsw_init(struct tulip_softc *sc) { struct tulip_21x4x_media *tm; + struct mii_data *mii = &sc->sc_mii; const char *sep = ""; sc->sc_gp_dir = GPP_COGENT_EM1x0_PINS; sc->sc_opmode = OPMODE_MBO | OPMODE_PS; TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode); - ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange, - tlp_mediastatus); + ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus); aprint_normal_dev(sc->sc_dev, ""); #define ADD(m, c) \ - tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); \ + tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); \ tm->tm_opmode = (c); \ tm->tm_gpdata = GPP_COGENT_EM1x0_INIT; \ - ifmedia_add(&sc->sc_mii.mii_media, (m), 0, tm) + ifmedia_add(&mii->mii_media, (m), 0, tm) #define PRINT(str) aprint_normal("%s%s", sep, str); sep = ", " if (sc->sc_srom[32] == 0x15) { @@ -1633,7 +1632,7 @@ tlp_cogent_em1x0_tmsw_init(struct tulip_softc *sc) PRINT("100baseFX-FDX"); aprint_normal("\n"); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_FX); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_100_FX); } else { ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, 0, 0), OPMODE_PS | OPMODE_PCS | OPMODE_SCR); @@ -1644,7 +1643,7 @@ tlp_cogent_em1x0_tmsw_init(struct tulip_softc *sc) PRINT("100baseTX-FDX"); aprint_normal("\n"); - ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_TX); + ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_100_TX); } #undef ADD |
