SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last fixes and improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-06-07 21:20:56 +00:00
parent 4b78db449c
commit bf0676207f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
2406 changed files with 6353 additions and 434004 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sys/dev/pci/if_mcx.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_mcx.c,v 1.106 2022/11/22 06:48:32 jmatthew Exp $ */
/* $OpenBSD: if_mcx.c,v 1.107 2023/06/06 01:40:04 dlg Exp $ */
/*
* Copyright (c) 2017 David Gwynne <dlg@openbsd.org>
@ -6793,16 +6793,6 @@ mcx_process_txeof(struct mcx_softc *sc, struct mcx_tx *tx,
return (slots);
}
static uint64_t
mcx_uptime(void)
{
struct timespec ts;
nanouptime(&ts);
return ((uint64_t)ts.tv_sec * 1000000000 + (uint64_t)ts.tv_nsec);
}
static void
mcx_calibrate_first(struct mcx_softc *sc)
{
@ -6812,7 +6802,7 @@ mcx_calibrate_first(struct mcx_softc *sc)
sc->sc_calibration_gen = 0;
s = splhigh(); /* crit_enter? */
c->c_ubase = mcx_uptime();
c->c_ubase = nsecuptime();
c->c_tbase = mcx_timer(sc);
splx(s);
c->c_ratio = 0;
@ -6847,7 +6837,7 @@ mcx_calibrate(void *arg)
nc->c_timestamp = pc->c_tbase;
s = splhigh(); /* crit_enter? */
nc->c_ubase = mcx_uptime();
nc->c_ubase = nsecuptime();
nc->c_tbase = mcx_timer(sc);
splx(s);