diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
| commit | 6c951b444129f35bc399ba6b89bdfd982620a557 (patch) | |
| tree | be9c80fe8655fe3ff639d46f9a599da535951d6d /sys/dev/fxp | |
| parent | ab36c06737cfd52b6f1999903ee7f91014ac51de (diff) | |
Notes
Diffstat (limited to 'sys/dev/fxp')
| -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 a4d1fccd45aa..09adcf76d89e 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 9c7e310cebb7..81789d607788 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 */ |