summaryrefslogtreecommitdiffstats
path: root/sys/pci/if_sis.c
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2003-09-05 22:33:44 +0000
committersam <sam@FreeBSD.org>2003-09-05 22:33:44 +0000
commit617e17d9977073443c46b78caadfdd065ab29ab6 (patch)
tree308effd22fb67351efe44a145a7a0a9a6dc593e2 /sys/pci/if_sis.c
parent61e32060ebe88a1fcc239db7013c06647fbee902 (diff)
downloadFreeBSD-src-617e17d9977073443c46b78caadfdd065ab29ab6.zip
FreeBSD-src-617e17d9977073443c46b78caadfdd065ab29ab6.tar.gz
change timer to MPSAFE
Sponsored by: FreeBSD Foundation
Diffstat (limited to 'sys/pci/if_sis.c')
-rw-r--r--sys/pci/if_sis.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index c25b4c2..1264862 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -1242,7 +1242,7 @@ sis_attach(dev)
printf("sis%d: Ethernet address: %6D\n", unit, eaddr, ":");
sc->sis_unit = unit;
- callout_handle_init(&sc->sis_stat_ch);
+ callout_init(&sc->sis_stat_ch, CALLOUT_MPSAFE);
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
/*
@@ -1763,7 +1763,7 @@ sis_tick(xsc)
sis_start(ifp);
}
- sc->sis_stat_ch = timeout(sis_tick, sc, hz);
+ callout_reset(&sc->sis_stat_ch, hz, sis_tick, sc);
sc->in_tick = 0;
SIS_UNLOCK(sc);
@@ -2236,7 +2236,7 @@ sis_init(xsc)
ifp->if_flags &= ~IFF_OACTIVE;
if (!sc->in_tick)
- sc->sis_stat_ch = timeout(sis_tick, sc, hz);
+ callout_reset(&sc->sis_stat_ch, hz, sis_tick, sc);
SIS_UNLOCK(sc);
@@ -2374,7 +2374,7 @@ sis_stop(sc)
ifp = &sc->arpcom.ac_if;
ifp->if_timer = 0;
- untimeout(sis_tick, sc, sc->sis_stat_ch);
+ callout_stop(&sc->sis_stat_ch);
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
#ifdef DEVICE_POLLING
OpenPOWER on IntegriCloud