net/bnxt: fix crash during Tx

[dpdk.git] / drivers / net / bnxt / bnxt_txr.c

diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 6e2ee86..c741c71 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -9,7 +9,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
 #include "bnxt_txr.h"
@@ -132,7 +131,10 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                                PKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM |
                                PKT_TX_TUNNEL_GRE | PKT_TX_TUNNEL_VXLAN |
                                PKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST |
-                               PKT_TX_QINQ_PKT))
+                               PKT_TX_QINQ_PKT) ||
+            (BNXT_TRUFLOW_EN(txq->bp) &&
+             (txq->bp->ulp_ctx->cfg_data->tx_cfa_action ||
+              txq->vfr_tx_cfa_action)))
                long_bd = true;
 
        nr_bds = long_bd + tx_pkt->nb_segs;
@@ -185,7 +187,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
        if (long_bd) {
                txbd->flags_type |= TX_BD_LONG_TYPE_TX_BD_LONG;
                vlan_tag_flags = 0;
-               cfa_action = 0;
+
+               if (BNXT_TRUFLOW_EN(txq->bp)) {
+                       if (txq->vfr_tx_cfa_action)
+                               cfa_action = txq->vfr_tx_cfa_action;
+                       else
+                               cfa_action =
+                                     txq->bp->ulp_ctx->cfg_data->tx_cfa_action;
+               }
+
                /* HW can accelerate only outer vlan in QinQ mode */
                if (tx_buf->mbuf->ol_flags & PKT_TX_QINQ_PKT) {
                        vlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG |
@@ -213,7 +223,9 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                                        &txr->tx_desc_ring[txr->tx_prod];
                txbd1->lflags = 0;
                txbd1->cfa_meta = vlan_tag_flags;
-               txbd1->cfa_action = cfa_action;
+
+               if (BNXT_TRUFLOW_EN(txq->bp))
+                       txbd1->cfa_action = cfa_action;
 
                if (tx_pkt->ol_flags & PKT_TX_TCP_SEG) {
                        uint16_t hdr_size;