Do not touch ifp->if_baudrate in miibus aware drivers.
This commit is contained in:
parent
cd8ad406ad
commit
23033eebf4
@ -386,7 +386,6 @@ bfe_attach(device_t dev)
|
||||
ifp->if_watchdog = bfe_watchdog;
|
||||
ifp->if_init = bfe_init;
|
||||
ifp->if_mtu = ETHERMTU;
|
||||
ifp->if_baudrate = 100000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, BFE_TX_QLEN);
|
||||
ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -2201,7 +2201,6 @@ dc_attach(device_t dev)
|
||||
ifp->if_start = dc_start;
|
||||
ifp->if_watchdog = dc_watchdog;
|
||||
ifp->if_init = dc_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, DC_TX_LIST_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = DC_TX_LIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -758,7 +758,6 @@ fxp_attach(device_t dev)
|
||||
}
|
||||
|
||||
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
|
||||
ifp->if_baudrate = 100000000;
|
||||
ifp->if_init = fxp_init;
|
||||
ifp->if_softc = sc;
|
||||
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
|
||||
|
@ -546,7 +546,6 @@ lge_attach(dev)
|
||||
ifp->if_start = lge_start;
|
||||
ifp->if_watchdog = lge_watchdog;
|
||||
ifp->if_init = lge_init;
|
||||
ifp->if_baudrate = 1000000000;
|
||||
ifp->if_snd.ifq_maxlen = LGE_TX_LIST_CNT - 1;
|
||||
ifp->if_capabilities = IFCAP_RXCSUM;
|
||||
ifp->if_capenable = ifp->if_capabilities;
|
||||
|
@ -860,7 +860,6 @@ nge_attach(dev)
|
||||
ifp->if_start = nge_start;
|
||||
ifp->if_watchdog = nge_watchdog;
|
||||
ifp->if_init = nge_init;
|
||||
ifp->if_baudrate = 1000000000;
|
||||
ifp->if_snd.ifq_maxlen = NGE_TX_LIST_CNT - 1;
|
||||
ifp->if_hwassist = NGE_CSUM_FEATURES;
|
||||
ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING;
|
||||
|
@ -1225,10 +1225,6 @@ re_attach(dev)
|
||||
#endif
|
||||
ifp->if_watchdog = re_watchdog;
|
||||
ifp->if_init = re_init;
|
||||
if (sc->rl_type == RL_8169)
|
||||
ifp->if_baudrate = 1000000000;
|
||||
else
|
||||
ifp->if_baudrate = 100000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN);
|
||||
ifp->if_snd.ifq_drv_maxlen = RL_IFQ_MAXLEN;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -768,7 +768,6 @@ sf_attach(dev)
|
||||
ifp->if_start = sf_start;
|
||||
ifp->if_watchdog = sf_watchdog;
|
||||
ifp->if_init = sf_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, SF_TX_DLIST_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = SF_TX_DLIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -1487,7 +1487,6 @@ sk_attach(dev)
|
||||
ifp->if_start = sk_start;
|
||||
ifp->if_watchdog = sk_watchdog;
|
||||
ifp->if_init = sk_init;
|
||||
ifp->if_baudrate = 1000000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, SK_TX_RING_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = SK_TX_RING_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -248,7 +248,6 @@ epic_attach(device_t dev)
|
||||
ifp->if_watchdog = epic_ifwatchdog;
|
||||
ifp->if_init = epic_init;
|
||||
ifp->if_timer = 0;
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_snd.ifq_maxlen = TX_RING_SIZE - 1;
|
||||
|
||||
/* Enable busmastering. */
|
||||
@ -1192,13 +1191,6 @@ epic_miibus_statchg(device_t dev)
|
||||
CSR_WRITE_4(sc, MIICFG, sc->miicfg);
|
||||
}
|
||||
|
||||
/* Update baudrate. */
|
||||
if (IFM_SUBTYPE(media) == IFM_100_TX ||
|
||||
IFM_SUBTYPE(media) == IFM_100_FX)
|
||||
sc->ifp->if_baudrate = 100000000;
|
||||
else
|
||||
sc->ifp->if_baudrate = 10000000;
|
||||
|
||||
epic_stop_activity(sc);
|
||||
epic_set_tx_mode(sc);
|
||||
epic_start_activity(sc);
|
||||
|
@ -730,7 +730,6 @@ USB_ATTACH(aue)
|
||||
ifp->if_start = aue_start;
|
||||
ifp->if_watchdog = aue_watchdog;
|
||||
ifp->if_init = aue_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
|
||||
|
||||
/*
|
||||
|
@ -500,7 +500,6 @@ USB_ATTACH(axe)
|
||||
ifp->if_start = axe_start;
|
||||
ifp->if_watchdog = axe_watchdog;
|
||||
ifp->if_init = axe_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
|
||||
|
||||
sc->axe_qdat.ifp = ifp;
|
||||
|
@ -682,7 +682,6 @@ USB_ATTACH(rue)
|
||||
ifp->if_start = rue_start;
|
||||
ifp->if_watchdog = rue_watchdog;
|
||||
ifp->if_init = rue_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
|
||||
|
||||
/* MII setup */
|
||||
|
@ -415,7 +415,6 @@ USB_ATTACH(udav)
|
||||
ifp->if_stop = udav_stop;
|
||||
#endif
|
||||
#if defined(__FreeBSD__)
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
|
||||
#endif
|
||||
#if defined(__NetBSD__)
|
||||
|
@ -1061,7 +1061,6 @@ vge_attach(dev)
|
||||
#endif
|
||||
ifp->if_watchdog = vge_watchdog;
|
||||
ifp->if_init = vge_init;
|
||||
ifp->if_baudrate = 1000000000;
|
||||
ifp->if_snd.ifq_maxlen = VGE_IFQ_MAXLEN;
|
||||
|
||||
TASK_INIT(&sc->vge_txtask, 0, vge_tx_task, ifp);
|
||||
|
@ -701,7 +701,6 @@ vr_attach(dev)
|
||||
ifp->if_start = vr_start;
|
||||
ifp->if_watchdog = vr_watchdog;
|
||||
ifp->if_init = vr_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, VR_TX_LIST_CNT - 1);
|
||||
ifp->if_snd.ifq_maxlen = VR_TX_LIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -614,7 +614,6 @@ pcn_attach(dev)
|
||||
ifp->if_start = pcn_start;
|
||||
ifp->if_watchdog = pcn_watchdog;
|
||||
ifp->if_init = pcn_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_snd.ifq_maxlen = PCN_TX_LIST_CNT - 1;
|
||||
|
||||
/*
|
||||
|
@ -956,7 +956,6 @@ rl_attach(device_t dev)
|
||||
ifp->if_start = rl_start;
|
||||
ifp->if_watchdog = rl_watchdog;
|
||||
ifp->if_init = rl_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_capabilities = IFCAP_VLAN_MTU;
|
||||
ifp->if_capenable = ifp->if_capabilities;
|
||||
#ifdef DEVICE_POLLING
|
||||
|
@ -768,7 +768,6 @@ sf_attach(dev)
|
||||
ifp->if_start = sf_start;
|
||||
ifp->if_watchdog = sf_watchdog;
|
||||
ifp->if_init = sf_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, SF_TX_DLIST_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = SF_TX_DLIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -1196,7 +1196,6 @@ sis_attach(device_t dev)
|
||||
ifp->if_start = sis_start;
|
||||
ifp->if_watchdog = sis_watchdog;
|
||||
ifp->if_init = sis_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, SIS_TX_LIST_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = SIS_TX_LIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -1487,7 +1487,6 @@ sk_attach(dev)
|
||||
ifp->if_start = sk_start;
|
||||
ifp->if_watchdog = sk_watchdog;
|
||||
ifp->if_init = sk_init;
|
||||
ifp->if_baudrate = 1000000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, SK_TX_RING_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = SK_TX_RING_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -1088,7 +1088,6 @@ ste_attach(dev)
|
||||
ifp->if_start = ste_start;
|
||||
ifp->if_watchdog = ste_watchdog;
|
||||
ifp->if_init = ste_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, STE_TX_LIST_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = STE_TX_LIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -701,7 +701,6 @@ vr_attach(dev)
|
||||
ifp->if_start = vr_start;
|
||||
ifp->if_watchdog = vr_watchdog;
|
||||
ifp->if_init = vr_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, VR_TX_LIST_CNT - 1);
|
||||
ifp->if_snd.ifq_maxlen = VR_TX_LIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
|
@ -853,7 +853,6 @@ wb_attach(dev)
|
||||
ifp->if_start = wb_start;
|
||||
ifp->if_watchdog = wb_watchdog;
|
||||
ifp->if_init = wb_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
ifp->if_snd.ifq_maxlen = WB_TX_LIST_CNT - 1;
|
||||
|
||||
/*
|
||||
|
@ -1498,7 +1498,6 @@ xl_attach(device_t dev)
|
||||
ifp->if_start = xl_start;
|
||||
ifp->if_watchdog = xl_watchdog;
|
||||
ifp->if_init = xl_init;
|
||||
ifp->if_baudrate = 10000000;
|
||||
IFQ_SET_MAXLEN(&ifp->if_snd, XL_TX_LIST_CNT - 1);
|
||||
ifp->if_snd.ifq_drv_maxlen = XL_TX_LIST_CNT - 1;
|
||||
IFQ_SET_READY(&ifp->if_snd);
|
||||
@ -1586,7 +1585,6 @@ xl_attach(device_t dev)
|
||||
if (sc->xl_media & XL_MEDIAOPT_BFX) {
|
||||
if (bootverbose)
|
||||
device_printf(dev, "found 100baseFX\n");
|
||||
ifp->if_baudrate = 100000000;
|
||||
ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_100_FX, 0, NULL);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user