New upstream version 17.11-rc3

[deb_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 6870b16..8ca4bbd 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -161,7 +161,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
 
        if (tx_pkt->ol_flags & (PKT_TX_TCP_SEG | PKT_TX_TCP_CKSUM |
                                PKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM |
-                               PKT_TX_VLAN_PKT))
+                               PKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM))
                long_bd = true;
 
        tx_buf = &txr->tx_buf_ring[txr->tx_prod];
@@ -211,21 +211,39 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
 
                if (tx_pkt->ol_flags & PKT_TX_TCP_SEG) {
                        /* TSO */
-                       txbd1->lflags = TX_BD_LONG_LFLAGS_LSO;
+                       txbd1->lflags |= TX_BD_LONG_LFLAGS_LSO;
                        txbd1->hdr_size = tx_pkt->l2_len + tx_pkt->l3_len +
                                        tx_pkt->l4_len + tx_pkt->outer_l2_len +
                                        tx_pkt->outer_l3_len;
                        txbd1->mss = tx_pkt->tso_segsz;
 
-               } else if (tx_pkt->ol_flags & (PKT_TX_TCP_CKSUM |
-                                       PKT_TX_UDP_CKSUM)) {
+               } else if (tx_pkt->ol_flags & PKT_TX_OIP_IIP_TCP_UDP_CKSUM) {
+                       /* Outer IP, Inner IP, Inner TCP/UDP CSO */
+                       txbd1->lflags |= TX_BD_FLG_TIP_IP_TCP_UDP_CHKSUM;
+                       txbd1->mss = 0;
+               } else if (tx_pkt->ol_flags & PKT_TX_IIP_TCP_UDP_CKSUM) {
+                       /* (Inner) IP, (Inner) TCP/UDP CSO */
+                       txbd1->lflags |= TX_BD_FLG_IP_TCP_UDP_CHKSUM;
+                       txbd1->mss = 0;
+               } else if (tx_pkt->ol_flags & PKT_TX_OIP_TCP_UDP_CKSUM) {
+                       /* Outer IP, (Inner) TCP/UDP CSO */
+                       txbd1->lflags |= TX_BD_FLG_TIP_TCP_UDP_CHKSUM;
+                       txbd1->mss = 0;
+               } else if (tx_pkt->ol_flags & PKT_TX_OIP_IIP_CKSUM) {
+                       /* Outer IP, Inner IP CSO */
+                       txbd1->lflags |= TX_BD_FLG_TIP_IP_CHKSUM;
+                       txbd1->mss = 0;
+               } else if (tx_pkt->ol_flags & PKT_TX_TCP_UDP_CKSUM) {
                        /* TCP/UDP CSO */
-                       txbd1->lflags = TX_BD_LONG_LFLAGS_TCP_UDP_CHKSUM;
+                       txbd1->lflags |= TX_BD_LONG_LFLAGS_TCP_UDP_CHKSUM;
                        txbd1->mss = 0;
-
                } else if (tx_pkt->ol_flags & PKT_TX_IP_CKSUM) {
                        /* IP CSO */
-                       txbd1->lflags = TX_BD_LONG_LFLAGS_IP_CHKSUM;
+                       txbd1->lflags |= TX_BD_LONG_LFLAGS_IP_CHKSUM;
+                       txbd1->mss = 0;
+               } else if (tx_pkt->ol_flags & PKT_TX_OUTER_IP_CKSUM) {
+                       /* IP CSO */
+                       txbd1->lflags |= TX_BD_LONG_LFLAGS_T_IP_CHKSUM;
                        txbd1->mss = 0;
                }
        } else {
@@ -295,6 +313,9 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq)
 
                        if (!CMP_VALID(txcmp, raw_cons, cpr->cp_ring_struct))
                                break;
+                       cpr->valid = FLIP_VALID(cons,
+                                               cpr->cp_ring_struct->ring_mask,
+                                               cpr->valid);
 
                        if (CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)
                                nb_tx_pkts++;