diff options
author | gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
---|---|---|
committer | gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
commit | a415512fd4b3c95c87808401c97e649c8ac7f41e (patch) | |
tree | 8463ee0d001498dfdefc34fc8911c491b2f0ecf0 /sys/dev | |
parent | 52ace446d29ab170f74f1db02832f24b01e04f20 (diff) | |
download | FreeBSD-src-a415512fd4b3c95c87808401c97e649c8ac7f41e.zip FreeBSD-src-a415512fd4b3c95c87808401c97e649c8ac7f41e.tar.gz |
Update for new callout interface.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/fxp/if_fxp.c | 7 | ||||
-rw-r--r-- | sys/dev/fxp/if_fxpvar.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index a4d1fcc..09adcf7 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: if_fxp.c,v 1.39 1997/09/05 10:23:54 davidg Exp $ */ /* @@ -515,6 +515,7 @@ fxp_attach(config_id, unit) if (sc == NULL) return; bzero(sc, sizeof(struct fxp_softc)); + callout_handle_init(&sc->stat_ch); s = splimp(); @@ -1112,7 +1113,7 @@ fxp_stop(sc) /* * Cancel stats updater. */ - untimeout(fxp_stats_update, sc); + untimeout(fxp_stats_update, sc, sc->stat_ch); /* * Issue software reset @@ -1337,7 +1338,7 @@ fxp_init(xsc) /* * Start stats updater. */ - timeout(fxp_stats_update, sc, hz); + sc->stat_ch = timeout(fxp_stats_update, sc, hz); } void diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h index 9c7e310..81789d6 100644 --- a/sys/dev/fxp/if_fxpvar.h +++ b/sys/dev/fxp/if_fxpvar.h @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: if_fxpvar.h,v 1.1 1997/09/05 10:23:58 davidg Exp $ */ /* @@ -53,6 +53,7 @@ struct fxp_softc { struct mbuf *rfa_headm; /* first mbuf in receive frame area */ struct mbuf *rfa_tailm; /* last mbuf in receive frame area */ struct fxp_stats *fxp_stats; /* Pointer to interface stats */ + struct callout_handle stat_ch; /* Handle for canceling our stat timeout */ int tx_queued; /* # of active TxCB's */ int promisc_mode; /* promiscuous mode enabled */ int phy_primary_addr; /* address of primary PHY */ |