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

Always put controller into known state before device intialization.

Browse Source 
While here remove re_reset calls invoked in system error case as
controller reset is always done in device initialization.
This commit is contained in:
Pyun YongHyeon 2008-12-11 00:46:07 +00:00
parent f68bc089f9
commit b659f1f0fe
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/re/if_re.c
View File

@ -756,7 +756,6 @@ re_diag(struct rl_softc *sc)
ifp->if_flags |= IFF_PROMISC;
sc->rl_testmode = 1;
re_reset(sc);
re_init_locked(sc);
sc->rl_flags |= RL_FLAG_LINK;
if (sc->rl_type == RL_8169)
@ -2091,10 +2090,8 @@ re_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count)
* XXX check behaviour on receiver stalls.
*/
if (status & RL_ISR_SYSTEM_ERR) {
re_reset(sc);
if (status & RL_ISR_SYSTEM_ERR)
re_init_locked(sc);
}
}
}
#endif /* DEVICE_POLLING */
@ -2158,10 +2155,8 @@ re_int_task(void *arg, int npending)
RL_ISR_TX_ERR|RL_ISR_TX_DESC_UNAVAIL))
re_txeof(sc);
if (status & RL_ISR_SYSTEM_ERR) {
re_reset(sc);
if (status & RL_ISR_SYSTEM_ERR)
re_init_locked(sc);
}
if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
taskqueue_enqueue_fast(taskqueue_fast, &sc->rl_txtask);
@ -2482,6 +2477,9 @@ re_init_locked(struct rl_softc *sc)
*/
re_stop(sc);
/* Put controller into known state. */
re_reset(sc);
/*
* Enable C+ RX and TX mode, as well as VLAN stripping and
* RX checksum offload. We must configure the C+ register