From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Fri, 14 Jun 2019 04:20:57 +0000 (+0530)
Subject: net/bnxt: fix build with some compilers
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=07517400c4740397477153910edee38268294031;p=dpdk.git

net/bnxt: fix build with some compilers

The driver was defining its own version of roundup which was
conflicting with another version defined elsewhere.

Change the local definition of roundup to avoid compilation errors.

Fixes: f8168ca0e690 ("net/bnxt: support thor controller")

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 5f9c096a7d..8fc510351c 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3545,7 +3545,7 @@ static void bnxt_free_ctx_mem(struct bnxt *bp)
 	bp->ctx = NULL;
 }
 
-#define roundup(x, y)   ((((x) + ((y) - 1)) / (y)) * (y))
+#define bnxt_roundup(x, y)   ((((x) + ((y) - 1)) / (y)) * (y))
 
 #define min_t(type, x, y) ({                    \
 	type __min1 = (x);                      \
@@ -3612,7 +3612,7 @@ int bnxt_alloc_ctx_mem(struct bnxt *bp)
 		return rc;
 
 	entries = ctx->qp_max_l2_entries;
-	entries = roundup(entries, ctx->tqm_entries_multiple);
+	entries = bnxt_roundup(entries, ctx->tqm_entries_multiple);
 	entries = clamp_t(uint32_t, entries, ctx->tqm_min_entries_per_ring,
 			  ctx->tqm_max_entries_per_ring);
 	for (i = 0, ena = 0; i < BNXT_MAX_Q; i++) {