35c35
< __FBSDID("$FreeBSD: head/sys/dev/pcn/if_pcn.c 195049 2009-06-26 11:45:06Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/dev/pcn/if_pcn.c 199560 2009-11-19 22:14:23Z jhb $");
146c146
< static void pcn_watchdog(struct ifnet *);
---
> static void pcn_watchdog(struct pcn_softc *);
633d632
< ifp->if_watchdog = pcn_watchdog;
951c950
< ifp->if_timer = (sc->pcn_cdata.pcn_tx_cnt == 0) ? 0 : 5;
---
> sc->pcn_timer = (sc->pcn_cdata.pcn_tx_cnt == 0) ? 0 : 5;
982a982,983
> if (sc->pcn_timer > 0 && --sc->pcn_timer == 0)
> pcn_watchdog(sc);
1150c1151
< ifp->if_timer = 5;
---
> sc->pcn_timer = 5;
1432,1433c1433
< pcn_watchdog(ifp)
< struct ifnet *ifp;
---
> pcn_watchdog(struct pcn_softc *sc)
1435c1435
< struct pcn_softc *sc;
---
> struct ifnet *ifp;
1437c1437,1438
< sc = ifp->if_softc;
---
> PCN_LOCK_ASSERT(sc);
> ifp = sc->pcn_ifp;
1439,1440d1439
< PCN_LOCK(sc);
<
1450,1453d1448
<
< PCN_UNLOCK(sc);
<
< return;
1468c1463
< ifp->if_timer = 0;
---
> sc->pcn_timer = 0;