mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-16 10:20:30 +00:00
change timeout to be MPSAFE
Sponsored by: FreeBSD Foundation
This commit is contained in:
parent
55b659ffc1
commit
45276e4aa4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=119786
@ -412,7 +412,7 @@ fxp_attach(device_t dev)
|
||||
int s, ipcbxmit_disable;
|
||||
|
||||
sc->dev = dev;
|
||||
callout_handle_init(&sc->stat_ch);
|
||||
callout_init(&sc->stat_ch, CALLOUT_MPSAFE);
|
||||
sysctl_ctx_init(&sc->sysctl_ctx);
|
||||
mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
|
||||
MTX_DEF);
|
||||
@ -1883,7 +1883,7 @@ fxp_tick(void *xsc)
|
||||
/*
|
||||
* Schedule another timeout one second from now.
|
||||
*/
|
||||
sc->stat_ch = timeout(fxp_tick, sc, hz);
|
||||
callout_reset(&sc->stat_ch, hz, fxp_tick, sc);
|
||||
FXP_UNLOCK(sc);
|
||||
splx(s);
|
||||
}
|
||||
@ -1908,7 +1908,7 @@ fxp_stop(struct fxp_softc *sc)
|
||||
/*
|
||||
* Cancel stats updater.
|
||||
*/
|
||||
untimeout(fxp_tick, sc, sc->stat_ch);
|
||||
callout_stop(&sc->stat_ch);
|
||||
|
||||
/*
|
||||
* Issue software reset, which also unloads the microcode.
|
||||
@ -2239,7 +2239,7 @@ fxp_init_body(struct fxp_softc *sc)
|
||||
/*
|
||||
* Start stats updater.
|
||||
*/
|
||||
sc->stat_ch = timeout(fxp_tick, sc, hz);
|
||||
callout_reset(&sc->stat_ch, hz, fxp_tick, sc);
|
||||
splx(s);
|
||||
}
|
||||
|
||||
|
@ -174,7 +174,7 @@ struct fxp_softc {
|
||||
struct fxp_stats *fxp_stats; /* Pointer to interface stats */
|
||||
u_int32_t stats_addr; /* DMA address of the stats structure */
|
||||
int rx_idle_secs; /* # of seconds RX has been idle */
|
||||
struct callout_handle stat_ch; /* Handle for canceling our stat timeout */
|
||||
struct callout stat_ch; /* stat callout */
|
||||
struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */
|
||||
u_int32_t mcs_addr; /* DMA address of the multicast cmd */
|
||||
struct ifmedia sc_media; /* media information */
|
||||
|
Loading…
Reference in New Issue
Block a user