hrev52603 adds 2 changesets to branch 'master'
old head: b9ca2a8d0ba0bcc40e783ec32188cd14e432f439
new head: 8604e84890c89fb87508b5a5cb472aaff6ec8742
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=8604e84890c8+%5Eb9ca2a8d0ba0
----------------------------------------------------------------------------
4cd471eb17b2: emulex_oce: Don't clobber ticks define
8604e84890c8: emulex_oce: Add driver to minimum image
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 5 insertions(+), 4 deletions(-)
build/jam/images/definitions/minimum | 1 +
src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c | 6 +++---
src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.h | 2 +-
############################################################################
Commit: 4cd471eb17b27ec5ed4553c4d3a9ee8bbde14e2c
URL: https://git.haiku-os.org/haiku/commit/?id=4cd471eb17b2
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Nov 28 15:47:15 2018 UTC
emulex_oce: Don't clobber ticks define
----------------------------------------------------------------------------
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;
};
############################################################################
Revision: hrev52603
Commit: 8604e84890c89fb87508b5a5cb472aaff6ec8742
URL: https://git.haiku-os.org/haiku/commit/?id=8604e84890c8
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Nov 28 15:49:02 2018 UTC
emulex_oce: Add driver to minimum image
----------------------------------------------------------------------------
diff --git a/build/jam/images/definitions/minimum
b/build/jam/images/definitions/minimum
index 88999a1fb1..bfeb94bca0 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -183,6 +183,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
atheros813x ar81xx attansic_l1 attansic_l2
broadcom440x broadcom570x
dec21xxx
+ emulex_oce
ipro100 ipro1000
jmicron2x0
marvell_yukon
