net/ice/base: add more macros for FDID priority

[dpdk.git] / drivers / net / ena / ena_ethdev.c

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index aa84fab..665afee 100644 (file)
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -27,7 +27,7 @@
 
 #define DRV_MODULE_VER_MAJOR   2
 #define DRV_MODULE_VER_MINOR   0
-#define DRV_MODULE_VER_SUBMINOR        1
+#define DRV_MODULE_VER_SUBMINOR        3
 
 #define ENA_IO_TXQ_IDX(q)      (2 * (q))
 #define ENA_IO_RXQ_IDX(q)      (2 * (q) + 1)
@@ -272,8 +272,14 @@ static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf,
        else if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV6)
                packet_type |= RTE_PTYPE_L3_IPV6;
 
-       if (unlikely(ena_rx_ctx->l4_csum_err))
-               ol_flags |= PKT_RX_L4_CKSUM_BAD;
+       if (!ena_rx_ctx->l4_csum_checked)
+               ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
+       else
+               if (unlikely(ena_rx_ctx->l4_csum_err) && !ena_rx_ctx->frag)
+                       ol_flags |= PKT_RX_L4_CKSUM_BAD;
+               else
+                       ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
+
        if (unlikely(ena_rx_ctx->l3_csum_err))
                ol_flags |= PKT_RX_IP_CKSUM_BAD;
 
@@ -403,6 +409,9 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev)
                        ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT);
        host_info->num_cpus = rte_lcore_count();
 
+       host_info->driver_supported_features =
+               ENA_ADMIN_HOST_INFO_RX_OFFSET_MASK;
+
        rc = ena_com_set_host_attributes(ena_dev);
        if (rc) {
                if (rc == -ENA_COM_UNSUPPORTED)
@@ -1163,7 +1172,7 @@ static int ena_queue_start(struct ena_ring *ring)
 
        if (ring->type == ENA_RING_TYPE_TX) {
                ring->tx_stats.available_desc =
-                       ena_com_free_desc(ring->ena_com_io_sq);
+                       ena_com_free_q_entries(ring->ena_com_io_sq);
                return 0;
        }
 
@@ -2007,6 +2016,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                ena_rx_ctx.max_bufs = rx_ring->sgl_size;
                ena_rx_ctx.ena_bufs = rx_ring->ena_bufs;
                ena_rx_ctx.descs = 0;
+               ena_rx_ctx.pkt_offset = 0;
                /* receive packet context */
                rc = ena_com_rx_pkt(rx_ring->ena_com_io_cq,
                                    rx_ring->ena_com_io_sq,
@@ -2042,6 +2052,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                                mbuf->nb_segs = ena_rx_ctx.descs;
                                mbuf->port = rx_ring->port_id;
                                mbuf->pkt_len = 0;
+                               mbuf->data_off += ena_rx_ctx.pkt_offset;
                                mbuf_head = mbuf;
                        } else {
                                /* for multi-segment pkts create mbuf chain */
@@ -2351,7 +2362,7 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                tx_ring->tx_stats.bytes += total_length;
        }
        tx_ring->tx_stats.available_desc =
-               ena_com_free_desc(tx_ring->ena_com_io_sq);
+               ena_com_free_q_entries(tx_ring->ena_com_io_sq);
 
        /* If there are ready packets to be xmitted... */
        if (sent_idx > 0) {
@@ -2386,7 +2397,7 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                        break;
        }
        tx_ring->tx_stats.available_desc =
-               ena_com_free_desc(tx_ring->ena_com_io_sq);
+               ena_com_free_q_entries(tx_ring->ena_com_io_sq);
 
        if (total_tx_descs > 0) {
                /* acknowledge completion of sent packets */