[dpdk-stable] [PATCH 19.11 1/9] net/bnxt: fix build failures after merging patches

[Kalesh A P]

From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>

There is a build failure after merging patches to 19.11.9.
Though the patches applies cleanly to 19.11 LTS repo,
observed build failure because some macros are changed in
upstream tree.

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 7 +++----
 drivers/net/bnxt/bnxt_hwrm.c   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 524764e..26cc3dc 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2417,14 +2417,13 @@ bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 
 		switch (cmpl_type) {
 		case CMPL_BASE_TYPE_RX_L2:
-		case CMPL_BASE_TYPE_RX_L2_V2:
 			agg_cnt = BNXT_RX_L2_AGG_BUFS(rxcmp);
 			raw_cons = raw_cons + CMP_LEN(cmpl_type) + agg_cnt;
 			desc++;
 			break;
 
 		case CMPL_BASE_TYPE_RX_TPA_END:
-			if (BNXT_CHIP_P5(rxq->bp)) {
+			if (BNXT_CHIP_THOR(rxq->bp)) {
 				struct rx_tpa_v2_end_cmpl_hi *p5_tpa_end;
 
 				p5_tpa_end = (void *)rxcmp;
@@ -3474,12 +3473,12 @@ static int bnxt_get_tx_ts(struct bnxt *bp, uint64_t *ts)
 static int bnxt_clr_rx_ts(struct bnxt *bp, uint64_t *last_ts)
 {
 	struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
-	struct bnxt_pf_info *pf = bp->pf;
+	struct bnxt_pf_info *pf = &bp->pf;
 	uint16_t port_id;
 	int i = 0;
 	uint32_t fifo;
 
-	if (!ptp || (bp->flags & BNXT_FLAG_CHIP_P5))
+	if (!ptp || BNXT_CHIP_THOR(bp))
 		return -EINVAL;
 
 	port_id = pf->port_id;
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 0d240b1..12f8107 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -5108,7 +5108,7 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp)
 	bp->max_req_len = HWRM_MAX_REQ_LEN;
 	bp->hwrm_cmd_timeout = SHORT_HWRM_CMD_TIMEOUT;
 
-	HWRM_PREP(&req, HWRM_VER_GET, BNXT_USE_CHIMP_MB);
+	HWRM_PREP(req, VER_GET, BNXT_USE_CHIMP_MB);
 	req.hwrm_intf_maj = HWRM_VERSION_MAJOR;
 	req.hwrm_intf_min = HWRM_VERSION_MINOR;
 	req.hwrm_intf_upd = HWRM_VERSION_UPDATE;
-- 
2.10.1