d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration"

Browse Source 
This reverts commit 9ab4dfce8f.

OPNsense users have reported a regression with fixed configs.

The e1000 api is not ready for this change.
This commit is contained in:
Kevin Bowling 2022-10-12 05:01:12 -07:00
parent 88e6c9a674
commit 66dad2db0a
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/e1000/if_em.c
View File

@ -1626,24 +1626,20 @@ em_if_media_change(if_ctx_t ctx)
sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;
break;
case IFM_100_TX:
sc->hw.mac.autoneg = DO_AUTO_NEG;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL;
sc->hw.mac.autoneg = false;
sc->hw.phy.autoneg_advertised = 0;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)
sc->hw.mac.forced_speed_duplex = ADVERTISE_100_FULL;
} else {
sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF;
else
sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF;
}
break;
case IFM_10_T:
sc->hw.mac.autoneg = DO_AUTO_NEG;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL;
sc->hw.mac.autoneg = false;
sc->hw.phy.autoneg_advertised = 0;
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX)
sc->hw.mac.forced_speed_duplex = ADVERTISE_10_FULL;
} else {
sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF;
else
sc->hw.mac.forced_speed_duplex = ADVERTISE_10_HALF;
}
break;
default:
device_printf(sc->dev, "Unsupported media type\n");