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

change timeout to be MPSAFE

Browse Source 
Sponsored by:	FreeBSD Foundation
This commit is contained in:
sam 2003-09-05 22:37:31 +00:00
parent 617e17d997
commit d1c253ce23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/fxp/if_fxp.c
View File

@ -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);
}

2
sys/dev/fxp/if_fxpvar.h
View File

@ -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 */