svn commit: r213131 - stable/7/sys/pci
Pyun YongHyeon
yongari at FreeBSD.org
Fri Sep 24 19:29:02 UTC 2010
Author: yongari
Date: Fri Sep 24 19:29:01 2010
New Revision: 213131
URL: http://svn.freebsd.org/changeset/base/213131
Log:
MFC r211767:
Remove unnecessary controller reinitialization.
PR: kern/87506
Modified:
stable/7/sys/pci/if_rl.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/pci/if_rl.c
==============================================================================
--- stable/7/sys/pci/if_rl.c Fri Sep 24 19:27:47 2010 (r213130)
+++ stable/7/sys/pci/if_rl.c Fri Sep 24 19:29:01 2010 (r213131)
@@ -1301,6 +1301,7 @@ rl_rxeof(struct rl_softc *sc)
total_len < ETHER_MIN_LEN ||
total_len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) {
ifp->if_ierrors++;
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
rl_init_locked(sc);
return;
}
@@ -1410,6 +1411,7 @@ rl_txeof(struct rl_softc *sc)
CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG);
oldthresh = sc->rl_txthresh;
/* error recovery */
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
rl_init_locked(sc);
/* restore original threshold */
sc->rl_txthresh = oldthresh;
@@ -1600,8 +1602,10 @@ rl_poll_locked(struct ifnet *ifp, enum p
/* XXX We should check behaviour on receiver stalls. */
- if (status & RL_ISR_SYSTEM_ERR)
+ if (status & RL_ISR_SYSTEM_ERR) {
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
rl_init_locked(sc);
+ }
}
}
#endif /* DEVICE_POLLING */
@@ -1638,8 +1642,10 @@ 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)
+ if (status & RL_ISR_SYSTEM_ERR) {
+ ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
rl_init_locked(sc);
+ }
}
if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
@@ -1801,6 +1807,9 @@ rl_init_locked(struct rl_softc *sc)
mii = device_get_softc(sc->rl_miibus);
+ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+ return;
+
/*
* Cancel pending I/O and free all RX/TX buffers.
*/
@@ -2029,6 +2038,7 @@ rl_watchdog(struct rl_softc *sc)
rl_txeof(sc);
rl_rxeof(sc);
+ sc->rl_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
rl_init_locked(sc);
}
More information about the svn-src-stable-7
mailing list