Module Name: src
Committed By: thorpej
Date: Fri Feb 7 00:04:28 UTC 2020
Modified Files:
src/sys/dev/pci: if_bce.c if_bge.c if_bnx.c if_cas.c if_ena.c if_jme.c
if_pcn.c if_sip.c if_ste.c if_stge.c if_vr.c if_vte.c
Log Message:
Use callout_setfunc() / callout_schedule().
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pci/if_bce.c
cvs rdiff -u -r1.344 -r1.345 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/pci/if_bnx.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/if_cas.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_ena.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pci/if_pcn.c
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_ste.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/if_stge.c
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/pci/if_vr.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_vte.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.57 src/sys/dev/pci/if_bce.c:1.58
--- src/sys/dev/pci/if_bce.c:1.57 Thu Jan 30 13:56:48 2020
+++ src/sys/dev/pci/if_bce.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.57 2020/01/30 13:56:48 thorpej Exp $ */
+/* $NetBSD: if_bce.c,v 1.58 2020/02/07 00:04:28 thorpej Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.57 2020/01/30 13:56:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.58 2020/02/07 00:04:28 thorpej Exp $");
#include "vlan.h"
@@ -475,6 +475,7 @@ bce_attach(device_t parent, device_t sel
rnd_attach_source(&sc->rnd_source, device_xname(self),
RND_TYPE_NET, RND_FLAG_DEFAULT);
callout_init(&sc->bce_timeout, 0);
+ callout_setfunc(&sc->bce_timeout, bce_tick, sc);
if (pmf_device_register(self, NULL, bce_resume))
pmf_class_network_register(self, ifp);
@@ -998,7 +999,7 @@ bce_init(struct ifnet *ifp)
BCE_ENET_CTL) | EC_EE);
/* start timer */
- callout_reset(&sc->bce_timeout, hz, bce_tick, sc);
+ callout_schedule(&sc->bce_timeout, hz);
/* mark as running, and no outputs active */
ifp->if_flags |= IFF_RUNNING;
@@ -1487,5 +1488,5 @@ bce_tick(void *v)
mii_tick(&sc->bce_mii);
splx(s);
- callout_reset(&sc->bce_timeout, hz, bce_tick, sc);
+ callout_schedule(&sc->bce_timeout, hz);
}
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.344 src/sys/dev/pci/if_bge.c:1.345
--- src/sys/dev/pci/if_bge.c:1.344 Tue Feb 4 05:44:14 2020
+++ src/sys/dev/pci/if_bge.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.344 2020/02/04 05:44:14 thorpej Exp $ */
+/* $NetBSD: if_bge.c,v 1.345 2020/02/07 00:04:28 thorpej Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.344 2020/02/04 05:44:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.345 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -4010,6 +4010,7 @@ again:
#endif /* BGE_EVENT_COUNTERS */
DPRINTFN(5, ("callout_init\n"));
callout_init(&sc->bge_timeout, 0);
+ callout_setfunc(&sc->bge_timeout, bge_tick, sc);
if (pmf_device_register(self, NULL, NULL))
pmf_class_network_register(self, ifp);
@@ -4802,7 +4803,7 @@ bge_tick(void *xsc)
bge_asf_driver_up(sc);
if (!sc->bge_detaching)
- callout_reset(&sc->bge_timeout, hz, bge_tick, sc);
+ callout_schedule(&sc->bge_timeout, hz);
splx(s);
}
@@ -5693,7 +5694,7 @@ bge_init(struct ifnet *ifp)
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
- callout_reset(&sc->bge_timeout, hz, bge_tick, sc);
+ callout_schedule(&sc->bge_timeout, hz);
out:
sc->bge_if_flags = ifp->if_flags;
Index: src/sys/dev/pci/if_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.91 src/sys/dev/pci/if_bnx.c:1.92
--- src/sys/dev/pci/if_bnx.c:1.91 Tue Feb 4 05:44:14 2020
+++ src/sys/dev/pci/if_bnx.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.91 2020/02/04 05:44:14 thorpej Exp $ */
+/* $NetBSD: if_bnx.c,v 1.92 2020/02/07 00:04:28 thorpej Exp $ */
/* $OpenBSD: if_bnx.c,v 1.101 2013/03/28 17:21:44 brad Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.91 2020/02/04 05:44:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.92 2020/02/07 00:04:28 thorpej Exp $");
/*
* The following controllers are supported by this driver:
@@ -912,6 +912,7 @@ bnx_attach(device_t parent, device_t sel
ether_ifattach(ifp, sc->eaddr);
callout_init(&sc->bnx_timeout, 0);
+ callout_setfunc(&sc->bnx_timeout, bnx_tick, sc);
/* Hookup IRQ last. */
sc->bnx_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, bnx_intr,
@@ -5065,7 +5066,7 @@ bnx_init(struct ifnet *ifp)
SET(ifp->if_flags, IFF_RUNNING);
CLR(ifp->if_flags, IFF_OACTIVE);
- callout_reset(&sc->bnx_timeout, hz, bnx_tick, sc);
+ callout_schedule(&sc->bnx_timeout, hz);
bnx_init_exit:
DBPRINT(sc, BNX_VERBOSE_RESET, "Exiting %s()\n", __func__);
@@ -5894,7 +5895,7 @@ bnx_tick(void *xsc)
/* Schedule the next tick. */
if (!sc->bnx_detaching)
- callout_reset(&sc->bnx_timeout, hz, bnx_tick, sc);
+ callout_schedule(&sc->bnx_timeout, hz);
if (sc->bnx_link)
goto bnx_tick_exit;
Index: src/sys/dev/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.39 src/sys/dev/pci/if_cas.c:1.40
--- src/sys/dev/pci/if_cas.c:1.39 Tue Feb 4 05:44:14 2020
+++ src/sys/dev/pci/if_cas.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.39 2020/02/04 05:44:14 thorpej Exp $ */
+/* $NetBSD: if_cas.c,v 1.40 2020/02/07 00:04:28 thorpej Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.39 2020/02/04 05:44:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.40 2020/02/07 00:04:28 thorpej Exp $");
#ifndef _MODULE
#include "opt_inet.h"
@@ -732,6 +732,7 @@ cas_config(struct cas_softc *sc, const u
NULL, device_xname(sc->sc_dev), "interrupts");
callout_init(&sc->sc_tick_ch, 0);
+ callout_setfunc(&sc->sc_tick_ch, cas_tick, sc);
return;
}
@@ -875,7 +876,7 @@ cas_tick(void *arg)
mii_tick(&sc->sc_mii);
splx(s);
- callout_reset(&sc->sc_tick_ch, hz, cas_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
int
@@ -1277,7 +1278,7 @@ cas_init(struct ifnet *ifp)
bus_space_write_4(t, h, CAS_RX_KICK2, 4);
/* Start the one second timer. */
- callout_reset(&sc->sc_tick_ch, hz, cas_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
Index: src/sys/dev/pci/if_ena.c
diff -u src/sys/dev/pci/if_ena.c:1.21 src/sys/dev/pci/if_ena.c:1.22
--- src/sys/dev/pci/if_ena.c:1.21 Tue Feb 4 05:44:14 2020
+++ src/sys/dev/pci/if_ena.c Fri Feb 7 00:04:28 2020
@@ -31,7 +31,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.21 2020/02/04 05:44:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.22 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2261,8 +2261,7 @@ ena_up(struct ena_adapter *adapter)
if_setdrvflagbits(adapter->ifp, IFF_RUNNING,
IFF_OACTIVE);
- callout_reset(&adapter->timer_service, hz,
- ena_timer_service, (void *)adapter);
+ callout_schedule(&adapter->timer_service, hz);
adapter->up = true;
@@ -3629,8 +3628,7 @@ ena_reset_task(struct work *wk, void *ar
}
}
- callout_reset(&adapter->timer_service, hz,
- ena_timer_service, (void *)adapter);
+ callout_schedule(&adapter->timer_service, hz);
rw_exit(&adapter->ioctl_sx);
@@ -3800,6 +3798,7 @@ ena_attach(device_t parent, device_t sel
}
callout_init(&adapter->timer_service, CALLOUT_MPSAFE);
+ callout_setfunc(&adapter->timer_service, ena_timer_service, adapter);
/* Initialize reset task queue */
rc = workqueue_create(&adapter->reset_tq, "ena_reset_enq",
Index: src/sys/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.47 src/sys/dev/pci/if_jme.c:1.48
--- src/sys/dev/pci/if_jme.c:1.47 Thu Jan 30 05:42:00 2020
+++ src/sys/dev/pci/if_jme.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.47 2020/01/30 05:42:00 thorpej Exp $ */
+/* $NetBSD: if_jme.c,v 1.48 2020/02/07 00:04:28 thorpej Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.47 2020/01/30 05:42:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.48 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
@@ -280,6 +280,7 @@ jme_pci_attach(device_t parent, device_t
sc->jme_dev = self;
aprint_normal("\n");
callout_init(&sc->jme_tick_ch, 0);
+ callout_setfunc(&sc->jme_tick_ch, jme_ticks, sc);
jp = jme_lookup_product(pa->pa_id);
if (jp == NULL)
@@ -962,7 +963,7 @@ jme_init(struct ifnet *ifp, int do_ifini
sc->jme_txcsr | TXCSR_TX_ENB);
/* start ticks calls */
- callout_reset(&sc->jme_tick_ch, hz, jme_ticks, sc);
+ callout_schedule(&sc->jme_tick_ch, hz);
sc->jme_if.if_flags |= IFF_RUNNING;
sc->jme_if.if_flags &= ~IFF_OACTIVE;
splx(s);
@@ -1756,7 +1757,7 @@ jme_ticks(void *v)
mii_tick(&sc->jme_mii);
/* every seconds */
- callout_reset(&sc->jme_tick_ch, hz, jme_ticks, sc);
+ callout_schedule(&sc->jme_tick_ch, hz);
splx(s);
}
Index: src/sys/dev/pci/if_pcn.c
diff -u src/sys/dev/pci/if_pcn.c:1.73 src/sys/dev/pci/if_pcn.c:1.74
--- src/sys/dev/pci/if_pcn.c:1.73 Wed Jan 29 06:46:58 2020
+++ src/sys/dev/pci/if_pcn.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pcn.c,v 1.73 2020/01/29 06:46:58 thorpej Exp $ */
+/* $NetBSD: if_pcn.c,v 1.74 2020/02/07 00:04:28 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.73 2020/01/29 06:46:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.74 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -582,6 +582,7 @@ pcn_attach(device_t parent, device_t sel
sc->sc_dev = self;
callout_init(&sc->sc_tick_ch, 0);
+ callout_setfunc(&sc->sc_tick_ch, pcn_tick, sc);
aprint_normal(": AMD PCnet-PCI Ethernet\n");
@@ -1567,7 +1568,7 @@ pcn_tick(void *arg)
mii_tick(&sc->sc_mii);
splx(s);
- callout_reset(&sc->sc_tick_ch, hz, pcn_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
/*
@@ -1811,7 +1812,7 @@ pcn_init(struct ifnet *ifp)
if (sc->sc_flags & PCN_F_HAS_MII) {
/* Start the one second MII clock. */
- callout_reset(&sc->sc_tick_ch, hz, pcn_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
/* ...all done! */
Index: src/sys/dev/pci/if_sip.c
diff -u src/sys/dev/pci/if_sip.c:1.177 src/sys/dev/pci/if_sip.c:1.178
--- src/sys/dev/pci/if_sip.c:1.177 Tue Feb 4 05:44:14 2020
+++ src/sys/dev/pci/if_sip.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.177 2020/02/04 05:44:14 thorpej Exp $ */
+/* $NetBSD: if_sip.c,v 1.178 2020/02/07 00:04:28 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.177 2020/02/04 05:44:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.178 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -995,6 +995,7 @@ sipcom_attach(device_t parent, device_t
char intrbuf[PCI_INTRSTR_LEN];
callout_init(&sc->sc_tick_ch, 0);
+ callout_setfunc(&sc->sc_tick_ch, sipcom_tick, sc);
sip = sipcom_lookup(pa, strcmp(cf->cf_name, "gsip") == 0);
if (sip == NULL) {
@@ -2427,7 +2428,7 @@ sipcom_tick(void *arg)
mii_tick(&sc->sc_mii);
splx(s);
- callout_reset(&sc->sc_tick_ch, hz, sipcom_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
/*
@@ -2760,7 +2761,7 @@ sipcom_init(struct ifnet *ifp)
/*
* Start the one second MII clock.
*/
- callout_reset(&sc->sc_tick_ch, hz, sipcom_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
/*
* ...all done!
Index: src/sys/dev/pci/if_ste.c
diff -u src/sys/dev/pci/if_ste.c:1.59 src/sys/dev/pci/if_ste.c:1.60
--- src/sys/dev/pci/if_ste.c:1.59 Thu Jan 30 05:24:53 2020
+++ src/sys/dev/pci/if_ste.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ste.c,v 1.59 2020/01/30 05:24:53 thorpej Exp $ */
+/* $NetBSD: if_ste.c,v 1.60 2020/02/07 00:04:28 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.59 2020/01/30 05:24:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.60 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
@@ -310,6 +310,7 @@ ste_attach(device_t parent, device_t sel
sc->sc_dev = self;
callout_init(&sc->sc_tick_ch, 0);
+ callout_setfunc(&sc->sc_tick_ch, ste_tick, sc);
sp = ste_lookup(pa);
if (sp == NULL) {
@@ -1076,7 +1077,7 @@ ste_tick(void *arg)
ste_stats_update(sc);
splx(s);
- callout_reset(&sc->sc_tick_ch, hz, ste_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
/*
@@ -1333,7 +1334,7 @@ ste_init(struct ifnet *ifp)
/*
* Start the one second MII clock.
*/
- callout_reset(&sc->sc_tick_ch, hz, ste_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
/*
* ...all done!
Index: src/sys/dev/pci/if_stge.c
diff -u src/sys/dev/pci/if_stge.c:1.78 src/sys/dev/pci/if_stge.c:1.79
--- src/sys/dev/pci/if_stge.c:1.78 Thu Jan 30 05:24:53 2020
+++ src/sys/dev/pci/if_stge.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.78 2020/01/30 05:24:53 thorpej Exp $ */
+/* $NetBSD: if_stge.c,v 1.79 2020/02/07 00:04:28 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.78 2020/01/30 05:24:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.79 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
@@ -409,6 +409,7 @@ stge_attach(device_t parent, device_t se
sc->sc_dev = self;
callout_init(&sc->sc_tick_ch, 0);
+ callout_setfunc(&sc->sc_tick_ch, stge_tick, sc);
sp = stge_lookup(pa);
if (sp == NULL) {
@@ -1416,7 +1417,7 @@ stge_tick(void *arg)
stge_stats_update(sc);
splx(s);
- callout_reset(&sc->sc_tick_ch, hz, stge_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
/*
@@ -1684,7 +1685,7 @@ stge_init(struct ifnet *ifp)
/*
* Start the one second MII clock.
*/
- callout_reset(&sc->sc_tick_ch, hz, stge_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
/*
* ...all done!
Index: src/sys/dev/pci/if_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.132 src/sys/dev/pci/if_vr.c:1.133
--- src/sys/dev/pci/if_vr.c:1.132 Thu Jan 30 05:24:53 2020
+++ src/sys/dev/pci/if_vr.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.132 2020/01/30 05:24:53 thorpej Exp $ */
+/* $NetBSD: if_vr.c,v 1.133 2020/02/07 00:04:28 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.132 2020/01/30 05:24:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.133 2020/02/07 00:04:28 thorpej Exp $");
@@ -1275,7 +1275,7 @@ vr_init(struct ifnet *ifp)
ifp->if_flags &= ~IFF_OACTIVE;
/* Start one second timer. */
- callout_reset(&sc->vr_tick_ch, hz, vr_tick, sc);
+ callout_schedule(&sc->vr_tick_ch, hz);
/* Attempt to start output on the interface. */
vr_start(ifp);
@@ -1356,7 +1356,7 @@ vr_tick(void *arg)
mii_tick(&sc->vr_mii);
splx(s);
- callout_reset(&sc->vr_tick_ch, hz, vr_tick, sc);
+ callout_schedule(&sc->vr_tick_ch, hz);
}
/*
@@ -1498,6 +1498,7 @@ vr_attach(device_t parent, device_t self
sc->vr_tag = pa->pa_tag;
sc->vr_id = pa->pa_id;
callout_init(&sc->vr_tick_ch, 0);
+ callout_setfunc(&sc->vr_tick_ch, vr_tick, sc);
pci_aprint_devinfo(pa, NULL);
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.30 src/sys/dev/pci/if_vte.c:1.31
--- src/sys/dev/pci/if_vte.c:1.30 Tue Feb 4 05:44:14 2020
+++ src/sys/dev/pci/if_vte.c Fri Feb 7 00:04:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.30 2020/02/04 05:44:14 thorpej Exp $ */
+/* $NetBSD: if_vte.c,v 1.31 2020/02/07 00:04:28 thorpej Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.30 2020/02/04 05:44:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.31 2020/02/07 00:04:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -178,6 +178,7 @@ vte_attach(device_t parent, device_t sel
sc->vte_dev = self;
callout_init(&sc->vte_tick_ch, 0);
+ callout_setfunc(&sc->vte_tick_ch, vte_tick, sc);
/* Map the device. */
h_valid = 0;
@@ -1203,7 +1204,7 @@ vte_tick(void *arg)
vte_stats_update(sc);
vte_txeof(sc);
vte_ifwatchdog(&sc->vte_if);
- callout_reset(&sc->vte_tick_ch, hz, vte_tick, sc);
+ callout_schedule(&sc->vte_tick_ch, hz);
splx(s);
}
@@ -1367,7 +1368,7 @@ vte_init(struct ifnet *ifp)
return error;
}
- callout_reset(&sc->vte_tick_ch, hz, vte_tick, sc);
+ callout_schedule(&sc->vte_tick_ch, hz);
DPRINTF(("ipend 0x%x 0x%x\n", CSR_READ_2(sc, VTE_MIER),
CSR_READ_2(sc, VTE_MISR)));
