i40e/base: update Flex-10 capabilities

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

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index f47e96c..398ada2 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ident "$Id$"
 
 #include <stdio.h>
 
@@ -423,11 +422,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                rx_pkt->pkt_len = bytes_written;
 
                if (ipv4) {
-#ifdef RTE_NEXT_ABI
                        rx_pkt->packet_type = RTE_PTYPE_L3_IPV4;
-#else
-                       rx_pkt->ol_flags |= PKT_RX_IPV4_HDR;
-#endif
                        if (!csum_not_calc) {
                                if (unlikely(!ipv4_csum_ok))
                                        rx_pkt->ol_flags |= PKT_RX_IP_CKSUM_BAD;
@@ -436,11 +431,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                        rx_pkt->ol_flags |= PKT_RX_L4_CKSUM_BAD;
                        }
                } else if (ipv6)
-#ifdef RTE_NEXT_ABI
                        rx_pkt->packet_type = RTE_PTYPE_L3_IPV6;
-#else
-                       rx_pkt->ol_flags |= PKT_RX_IPV6_HDR;
-#endif
        } else {
                /* Header split */
                if (sop && !eop) {
@@ -453,11 +444,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                *rx_pkt_bucket = rx_pkt;
                                rx_pkt->pkt_len = bytes_written;
                                if (ipv4) {
-#ifdef RTE_NEXT_ABI
                                        rx_pkt->packet_type = RTE_PTYPE_L3_IPV4;
-#else
-                                       rx_pkt->ol_flags |= PKT_RX_IPV4_HDR;
-#endif
                                        if (!csum_not_calc) {
                                                if (unlikely(!ipv4_csum_ok))
                                                        rx_pkt->ol_flags |=
@@ -469,22 +456,14 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                                            PKT_RX_L4_CKSUM_BAD;
                                        }
                                } else if (ipv6)
-#ifdef RTE_NEXT_ABI
                                        rx_pkt->packet_type = RTE_PTYPE_L3_IPV6;
-#else
-                                       rx_pkt->ol_flags |= PKT_RX_IPV6_HDR;
-#endif
                        } else {
                                /* Payload */
                                hdr_rx_pkt = *rx_pkt_bucket;
                                hdr_rx_pkt->pkt_len += bytes_written;
                                if (ipv4) {
-#ifdef RTE_NEXT_ABI
                                        hdr_rx_pkt->packet_type =
                                                RTE_PTYPE_L3_IPV4;
-#else
-                                       hdr_rx_pkt->ol_flags |= PKT_RX_IPV4_HDR;
-#endif
                                        if (!csum_not_calc) {
                                                if (unlikely(!ipv4_csum_ok))
                                                        hdr_rx_pkt->ol_flags |=
@@ -496,13 +475,8 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,
                                                            PKT_RX_L4_CKSUM_BAD;
                                        }
                                } else if (ipv6)
-#ifdef RTE_NEXT_ABI
                                        hdr_rx_pkt->packet_type =
                                                RTE_PTYPE_L3_IPV6;
-#else
-                                       hdr_rx_pkt->ol_flags |= PKT_RX_IPV6_HDR;
-#endif
-
                        }
                }
        }