net/sfc: fix meson build warning with gcc

[dpdk.git] / drivers / net / enic / enic_rxtx.c

diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 08d600f..2fe5a3f 100644 (file)
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -4,7 +4,8 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
+#include <rte_net.h>
 #include <rte_prefetch.h>
 
 #include "enic_compat.h"
@@ -14,6 +15,15 @@
 #include <rte_ip.h>
 #include <rte_tcp.h>
 
+#define        ENIC_TX_OFFLOAD_MASK (                   \
+               PKT_TX_VLAN_PKT |                \
+               PKT_TX_IP_CKSUM |                \
+               PKT_TX_L4_MASK |                 \
+               PKT_TX_TCP_SEG)
+
+#define        ENIC_TX_OFFLOAD_NOTSUP_MASK \
+       (PKT_TX_OFFLOAD_MASK ^ ENIC_TX_OFFLOAD_MASK)
+
 #define RTE_PMD_USE_PREFETCH
 
 #ifdef RTE_PMD_USE_PREFETCH
@@ -185,14 +195,14 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf)
        }
 
        /* checksum flags */
-       if (mbuf->packet_type & RTE_PTYPE_L3_IPV4) {
+       if (mbuf->packet_type & (RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L3_IPV6)) {
                if (!enic_cq_rx_desc_csum_not_calc(cqrd)) {
                        uint32_t l4_flags;
                        l4_flags = mbuf->packet_type & RTE_PTYPE_L4_MASK;
 
                        if (enic_cq_rx_desc_ipv4_csum_ok(cqrd))
                                pkt_flags |= PKT_RX_IP_CKSUM_GOOD;
-                       else
+                       else if (mbuf->packet_type & RTE_PTYPE_L3_IPV4)
                                pkt_flags |= PKT_RX_IP_CKSUM_BAD;
 
                        if (l4_flags == RTE_PTYPE_L4_UDP ||
@@ -433,6 +443,38 @@ unsigned int enic_cleanup_wq(__rte_unused struct enic *enic, struct vnic_wq *wq)
        return 0;
 }
 
+uint16_t enic_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+                       uint16_t nb_pkts)
+{
+       int32_t ret;
+       uint16_t i;
+       uint64_t ol_flags;
+       struct rte_mbuf *m;
+
+       for (i = 0; i != nb_pkts; i++) {
+               m = tx_pkts[i];
+               ol_flags = m->ol_flags;
+               if (ol_flags & ENIC_TX_OFFLOAD_NOTSUP_MASK) {
+                       rte_errno = -ENOTSUP;
+                       return i;
+               }
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+               ret = rte_validate_tx_offload(m);
+               if (ret != 0) {
+                       rte_errno = ret;
+                       return i;
+               }
+#endif
+               ret = rte_net_intel_cksum_prepare(m);
+               if (ret != 0) {
+                       rte_errno = ret;
+                       return i;
+               }
+       }
+
+       return i;
+}
+
 uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t nb_pkts)
 {
@@ -490,8 +532,8 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                }
 
                mss = 0;
-               vlan_id = 0;
-               vlan_tag_insert = 0;
+               vlan_id = tx_pkt->vlan_tci;
+               vlan_tag_insert = !!(ol_flags & PKT_TX_VLAN_PKT);
                bus_addr = (dma_addr_t)
                           (tx_pkt->buf_iova + tx_pkt->data_off);
 
@@ -531,10 +573,6 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                        }
                }
 
-               if (ol_flags & PKT_TX_VLAN_PKT) {
-                       vlan_tag_insert = 1;
-                       vlan_id = tx_pkt->vlan_tci;
-               }
 
                wq_enet_desc_enc(&desc_tmp, bus_addr, data_len, mss, header_len,
                                 offload_mode, eop, eop, 0, vlan_tag_insert,