Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emulex_oce: Don't clobber ticks define

Browse Source
This commit is contained in:
Alexander von Gluck IV 2018-11-28 15:47:15 +00:00
parent b9ca2a8d0b
commit 4cd471eb17
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c
View File

@ -1910,10 +1910,10 @@ oce_eqd_set_periodic(POCE_SOFTC sc)
now = ticks; now = ticks;
/* Over flow check */ /* Over flow check */
if ((now < aic->ticks) || (eqo->intr < aic->intr_prev)) if ((now < aic->_ticks) || (eqo->intr < aic->intr_prev))
goto done; goto done;
delta = now - aic->ticks; delta = now - aic->_ticks;
tps = delta/hz; tps = delta/hz;
/* Interrupt rate based on elapsed ticks */ /* Interrupt rate based on elapsed ticks */
@ -1943,7 +1943,7 @@ modify_eqd:
} }
done: done:
aic->intr_prev = eqo->intr; aic->intr_prev = eqo->intr;
aic->ticks = now; aic->_ticks = now;
} }
/* Is there atleast one eq that needs to be modified? */ /* Is there atleast one eq that needs to be modified? */

2
src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h
View File

@ -524,7 +524,7 @@ struct oce_aic_obj { /* Adaptive interrupt coalescing (AIC) info */
uint32_t max_eqd; /* in usecs */ uint32_t max_eqd; /* in usecs */
uint32_t cur_eqd; /* in usecs */ uint32_t cur_eqd; /* in usecs */
uint32_t et_eqd; /* configured value when aic is off */ uint32_t et_eqd; /* configured value when aic is off */
uint64_t ticks; uint64_t _ticks;
uint64_t intr_prev; uint64_t intr_prev;
}; };