33c33
< __FBSDID("$FreeBSD: head/sys/dev/fatm/if_fatm.c 183504 2008-09-30 18:52:43Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/fatm/if_fatm.c 199559 2009-11-19 22:06:40Z jhb $");
394c394
< fatm_watchdog(struct ifnet *ifp)
---
> fatm_watchdog(void *arg)
396c396
< struct fatm_softc *sc = ifp->if_softc;
---
> struct fatm_softc *sc;
398,403c398,401
< FATM_LOCK(sc);
< if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
< fatm_check_heartbeat(sc);
< ifp->if_timer = 5;
< }
< FATM_UNLOCK(sc);
---
> sc = arg;
> FATM_CHECKLOCK(sc);
> fatm_check_heartbeat(sc);
> callout_reset(&sc->watchdog_timer, hz * 5, fatm_watchdog, sc);
477c475
< sc->ifp->if_timer = 0;
---
> callout_stop(&sc->watchdog_timer);
1344c1342
< sc->ifp->if_timer = 5;
---
> callout_reset(&sc->watchdog_timer, hz * 5, fatm_watchdog, sc);
2545a2544
> callout_drain(&sc->watchdog_timer);
2786a2786
> callout_init_mtx(&sc->watchdog_timer, &sc->mtx, 0);
2827d2826
< ifp->if_watchdog = fatm_watchdog;