Backout part of rev 1.71, which breaks the interfaces on IBM/Intel blade
servers. PR: kern/68445 MFC after: 7 days
This commit is contained in:
parent
89af2d4283
commit
2eb15b9375
@ -3435,23 +3435,6 @@ bge_ifmedia_upd(ifp)
|
||||
return(EINVAL);
|
||||
switch(IFM_SUBTYPE(ifm->ifm_media)) {
|
||||
case IFM_AUTO:
|
||||
/*
|
||||
* The BCM5704 ASIC appears to have a special
|
||||
* mechanism for programming the autoneg
|
||||
* advertisement registers in TBI mode.
|
||||
*/
|
||||
if (sc->bge_asicrev == BGE_ASICREV_BCM5704) {
|
||||
uint32_t sgdig;
|
||||
CSR_WRITE_4(sc, BGE_TX_TBI_AUTONEG, 0);
|
||||
sgdig = CSR_READ_4(sc, BGE_SGDIG_CFG);
|
||||
sgdig |= BGE_SGDIGCFG_AUTO|
|
||||
BGE_SGDIGCFG_PAUSE_CAP|
|
||||
BGE_SGDIGCFG_ASYM_PAUSE;
|
||||
CSR_WRITE_4(sc, BGE_SGDIG_CFG,
|
||||
sgdig|BGE_SGDIGCFG_SEND);
|
||||
DELAY(5);
|
||||
CSR_WRITE_4(sc, BGE_SGDIG_CFG, sgdig);
|
||||
}
|
||||
break;
|
||||
case IFM_1000_SX:
|
||||
if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user