diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2023-04-23 06:22:16 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2023-04-23 06:22:16 +0000 |
| commit | 884350d56294db3c2422deefcb3dd3d8490015fe (patch) | |
| tree | 71d105d9991505cfbee3a5a2b08c18ce42579098 /sys/dev | |
| parent | 13353364f0afe3c6557b629e75c4ebedc1b1e576 (diff) | |
rename sc_tick to sc_phy_tick. no functional change.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/dwqe.c | 10 | ||||
| -rw-r--r-- | sys/dev/ic/dwqevar.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/dwqe.c b/sys/dev/ic/dwqe.c index 6479ff271b7..82e5581a683 100644 --- a/sys/dev/ic/dwqe.c +++ b/sys/dev/ic/dwqe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwqe.c,v 1.6 2023/04/22 06:36:35 dlg Exp $ */ +/* $OpenBSD: dwqe.c,v 1.7 2023/04/23 06:22:15 dlg Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2017, 2022 Patrick Wildt <patrick@blueri.se> @@ -116,7 +116,7 @@ dwqe_attach(struct dwqe_softc *sc) for (i = 0; i < 4; i++) sc->sc_hw_feature[i] = dwqe_read(sc, GMAC_MAC_HW_FEATURE(i)); - timeout_set(&sc->sc_tick, dwqe_tick, sc); + timeout_set(&sc->sc_phy_tick, dwqe_tick, sc); timeout_set(&sc->sc_rxto, dwqe_rxtick, sc); ifp = &sc->sc_ac.ac_if; @@ -518,7 +518,7 @@ dwqe_tick(void *arg) mii_tick(&sc->sc_mii); splx(s); - timeout_add_sec(&sc->sc_tick, 1); + timeout_add_sec(&sc->sc_phy_tick, 1); } void @@ -824,7 +824,7 @@ dwqe_up(struct dwqe_softc *sc) GMAC_CHAN_INTR_ENA_RIE | GMAC_CHAN_INTR_ENA_TIE); - timeout_add_sec(&sc->sc_tick, 1); + timeout_add_sec(&sc->sc_phy_tick, 1); } void @@ -836,7 +836,7 @@ dwqe_down(struct dwqe_softc *sc) int i; timeout_del(&sc->sc_rxto); - timeout_del(&sc->sc_tick); + timeout_del(&sc->sc_phy_tick); ifp->if_flags &= ~IFF_RUNNING; ifq_clr_oactive(&ifp->if_snd); diff --git a/sys/dev/ic/dwqevar.h b/sys/dev/ic/dwqevar.h index 12c10cba686..bdf0e3e1a57 100644 --- a/sys/dev/ic/dwqevar.h +++ b/sys/dev/ic/dwqevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dwqevar.h,v 1.4 2023/04/07 09:33:51 dlg Exp $ */ +/* $OpenBSD: dwqevar.h,v 1.5 2023/04/23 06:22:15 dlg Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2017, 2022 Patrick Wildt <patrick@blueri.se> @@ -62,6 +62,7 @@ struct dwqe_softc { int sc_link; int sc_phyloc; enum dwqe_phy_mode sc_phy_mode; + struct timeout sc_phy_tick; struct dwqe_dmamem *sc_txring; struct dwqe_buf *sc_txbuf; @@ -76,7 +77,6 @@ struct dwqe_softc { struct if_rxring sc_rx_ring; int sc_rx_cons; - struct timeout sc_tick; struct timeout sc_rxto; struct task sc_statchg_task; |