The RTE_DIV_ROUND_UP in rte_common.h makes DIV_ROUND_UP redundant. Base BITS_PER_BYTE and BITS_TO_LONGS definitions on whether BITS_TO_LONGS is defined instead.
Signed-off-by: Joshua Washington <[email protected]> --- drivers/net/rnp/base/rnp_osdep.h | 5 ++--- drivers/net/rnp/rnp_rxtx.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/rnp/base/rnp_osdep.h b/drivers/net/rnp/base/rnp_osdep.h index 58dcb40f90..b0e7906fab 100644 --- a/drivers/net/rnp/base/rnp_osdep.h +++ b/drivers/net/rnp/base/rnp_osdep.h @@ -53,10 +53,9 @@ typedef uint64_t u64; #define cpu_to_le32(v) rte_cpu_to_le_32((u32)(v)) #endif -#ifndef DIV_ROUND_UP -#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) +#ifndef BITS_TO_LONGS #define BITS_PER_BYTE (8) -#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) +#define BITS_TO_LONGS(nr) RTE_DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) #endif #define fls(n) rte_fls_u32(n) diff --git a/drivers/net/rnp/rnp_rxtx.c b/drivers/net/rnp/rnp_rxtx.c index 81e8c6ba44..143cd11ffe 100644 --- a/drivers/net/rnp/rnp_rxtx.c +++ b/drivers/net/rnp/rnp_rxtx.c @@ -1165,7 +1165,7 @@ rnp_calc_pkt_desc(struct rte_mbuf *tx_pkt) uint16_t count = 0; while (txd != NULL) { - count += DIV_ROUND_UP(txd->data_len, RNP_MAX_TSO_SEG_LEN); + count += RTE_DIV_ROUND_UP(txd->data_len, RNP_MAX_TSO_SEG_LEN); txd = txd->next; } -- 2.55.0.691.gc56d675ccc-goog
