A previous commit broke compilation for builds other than x86 and
aarch64. Fix by moving macro definitions to more appropriate header
files.
Fixes: 479387565605 ("net/bnxt: improve small ring sizes support")
Signed-off-by: Lance Richardson <lance.richard...@broadcom.com>
---
drivers/net/bnxt/bnxt_rxq.c | 1 -
drivers/net/bnxt/bnxt_rxq.h | 3 +++
drivers/net/bnxt/bnxt_rxr.c | 1 -
drivers/net/bnxt/bnxt_rxr.h | 3 +++
drivers/net/bnxt/bnxt_rxtx_vec_common.h | 4 ----
drivers/net/bnxt/bnxt_txq.c | 1 -
drivers/net/bnxt/bnxt_txq.h | 3 +++
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 57ba9a157..793a47d11 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -14,7 +14,6 @@
#include "bnxt_rxq.h"
#include "bnxt_rxr.h"
#include "bnxt_vnic.h"
-#include "bnxt_rxtx_vec_common.h"
#include "hsi_struct_def_dpdk.h"
/*
diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h
index 96c6e06a5..fae92ea45 100644
--- a/drivers/net/bnxt/bnxt_rxq.h
+++ b/drivers/net/bnxt/bnxt_rxq.h
@@ -6,6 +6,9 @@
#ifndef _BNXT_RQX_H_
#define _BNXT_RQX_H_
+/* Maximum receive burst supported in vector mode. */
+#define RTE_BNXT_MAX_RX_BURST 64U
+
struct bnxt;
struct bnxt_rx_ring_info;
struct bnxt_cp_ring_info;
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 89a964a49..ca3e0a521 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -20,7 +20,6 @@
#ifdef RTE_LIBRTE_IEEE1588
#include "bnxt_hwrm.h"
#endif
-#include "bnxt_rxtx_vec_common.h"
#include <bnxt_tf_common.h>
#include <ulp_mark_mgr.h>
diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h
index 4f5e23b85..250033690 100644
--- a/drivers/net/bnxt/bnxt_rxr.h
+++ b/drivers/net/bnxt/bnxt_rxr.h
@@ -167,6 +167,9 @@ static inline uint16_t bnxt_tpa_start_agg_id(struct bnxt
*bp,
#define BNXT_RX_POST_THRESH 32
+/* Number of descriptors to process per inner loop in vector mode. */
+#define RTE_BNXT_DESCS_PER_LOOP 4U
+
enum pkt_hash_types {
PKT_HASH_TYPE_NONE, /* Undefined type */
PKT_HASH_TYPE_L2, /* Input: src_MAC, dest_MAC */
diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_common.h
b/drivers/net/bnxt/bnxt_rxtx_vec_common.h
index 8c10fdfa1..4a48152fc 100644
--- a/drivers/net/bnxt/bnxt_rxtx_vec_common.h
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_common.h
@@ -9,10 +9,6 @@
#include "bnxt_rxq.h"
#include "bnxt_rxr.h"
-#define RTE_BNXT_MAX_RX_BURST 64U
-#define RTE_BNXT_MAX_TX_BURST 64U
-#define RTE_BNXT_DESCS_PER_LOOP 4U
-
#define TX_BD_FLAGS_CMPL ((1 << TX_BD_LONG_FLAGS_BD_CNT_SFT) | \
TX_BD_SHORT_FLAGS_COAL_NOW | \
TX_BD_SHORT_TYPE_TX_BD_SHORT | \
diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index 42930abbf..bdc7ffaaa 100644
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -11,7 +11,6 @@
#include "bnxt_ring.h"
#include "bnxt_txq.h"
#include "bnxt_txr.h"
-#include "bnxt_rxtx_vec_common.h"
/*
* TX Queues
diff --git a/drivers/net/bnxt/bnxt_txq.h b/drivers/net/bnxt/bnxt_txq.h
index 83a98536d..9f849fc71 100644
--- a/drivers/net/bnxt/bnxt_txq.h
+++ b/drivers/net/bnxt/bnxt_txq.h
@@ -6,6 +6,9 @@
#ifndef _BNXT_TXQ_H_
#define _BNXT_TXQ_H_
+/* Maximum transmit burst for vector mode. */
+#define RTE_BNXT_MAX_TX_BURST 64U
+
struct bnxt_tx_ring_info;
struct bnxt_cp_ring_info;
struct bnxt_tx_queue {
--
2.25.1
