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

Make rl_init_locked() call rl_reset. This will put hardware into

Browse Source 
sane state after resume/watchdog timeouts.
This commit is contained in:
Pyun YongHyeon 2008-10-25 02:52:06 +00:00
parent 85e0a22e77
commit f1ffe9d785
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/pci/if_rl.c
View File

@ -1342,7 +1342,6 @@ rl_txeof(struct rl_softc *sc)
CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG);
oldthresh = sc->rl_txthresh;
/* error recovery */
rl_reset(sc);
rl_init_locked(sc);
/* restore original threshold */
sc->rl_txthresh = oldthresh;
@ -1409,10 +1408,8 @@ rl_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count)
/* XXX We should check behaviour on receiver stalls. */
if (status & RL_ISR_SYSTEM_ERR) {
rl_reset(sc);
if (status & RL_ISR_SYSTEM_ERR)
rl_init_locked(sc);
}
}
}
#endif /* DEVICE_POLLING */
@ -1449,10 +1446,8 @@ rl_intr(void *arg)
rl_rxeof(sc);
if ((status & RL_ISR_TX_OK) || (status & RL_ISR_TX_ERR))
rl_txeof(sc);
if (status & RL_ISR_SYSTEM_ERR) {
rl_reset(sc);
if (status & RL_ISR_SYSTEM_ERR)
rl_init_locked(sc);
}
}
if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@ -1615,6 +1610,8 @@ rl_init_locked(struct rl_softc *sc)
*/
rl_stop(sc);
rl_reset(sc);
/*
* Init our MAC address. Even though the chipset
* documentation doesn't mention it, we need to enter "Config