Author: yongari
Date: Sat Oct 25 02:52:06 2008
New Revision: 184242
URL: http://svn.freebsd.org/changeset/base/184242
Log:
Make rl_init_locked() call rl_reset. This will put hardware into
sane state after resume/watchdog timeouts.
Modified:
head/sys/pci/if_rl.c
Modified: head/sys/pci/if_rl.c
==============================================================================
--- head/sys/pci/if_rl.c Sat Oct 25 02:41:11 2008 (r184241)
+++ head/sys/pci/if_rl.c Sat Oct 25 02:52:06 2008 (r184242)
@@ -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 p
/* 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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
