change timer to MPSAFE

Sponsored by:	FreeBSD Foundation

2 files changed, 5 insertions, 5 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
diff --git a/sys/pci/if_sisreg.h b/sys/pci/if_sisreg.h
index fa51a6f..daccbb1 100644
--- a/sys/pci/if_sisreg.h
+++ b/sys/pci/if_sisreg.h
@@ -469,7 +469,7 @@ struct sis_softc {
 	bus_dma_tag_t		sis_parent_tag;
 	bus_dma_tag_t		sis_tag;
 	struct sis_ring_data	sis_cdata;
-	struct callout_handle	sis_stat_ch;
+	struct callout		sis_stat_ch;
 #ifdef DEVICE_POLLING
 	int			rxcycles;
 #endif