From 4cd471eb17b27ec5ed4553c4d3a9ee8bbde14e2c Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 28 Nov 2018 15:47:15 +0000 Subject: [PATCH] emulex_oce: Don't clobber ticks define --- .../kernel/drivers/network/emulex_oce/dev/oce/oce_if.c | 6 +++--- .../kernel/drivers/network/emulex_oce/dev/oce/oce_if.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c index d43e60ddcd..365b6c71be 100644 --- a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c +++ b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c @@ -1910,10 +1910,10 @@ oce_eqd_set_periodic(POCE_SOFTC sc) now = ticks; /* Over flow check */ - if ((now < aic->ticks) || (eqo->intr < aic->intr_prev)) + if ((now < aic->_ticks) || (eqo->intr < aic->intr_prev)) goto done; - delta = now - aic->ticks; + delta = now - aic->_ticks; tps = delta/hz; /* Interrupt rate based on elapsed ticks */ @@ -1943,7 +1943,7 @@ modify_eqd: } done: aic->intr_prev = eqo->intr; - aic->ticks = now; + aic->_ticks = now; } /* Is there atleast one eq that needs to be modified? */ diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h index d30a3dc3ba..54a6e06cc5 100644 --- a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h +++ b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h @@ -524,7 +524,7 @@ struct oce_aic_obj { /* Adaptive interrupt coalescing (AIC) info */ uint32_t max_eqd; /* in usecs */ uint32_t cur_eqd; /* in usecs */ uint32_t et_eqd; /* configured value when aic is off */ - uint64_t ticks; + uint64_t _ticks; uint64_t intr_prev; };