net: add rte prefix to ether defines

[dpdk.git] / drivers / net / qede / qede_rxtx.c

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index eda19b2..235f78a 100644 (file)
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -950,34 +950,34 @@ static inline uint8_t qede_check_notunn_csum_l4(uint16_t flag)
 static inline uint32_t qede_rx_cqe_to_pkt_type_outer(struct rte_mbuf *m)
 {
        uint32_t packet_type = RTE_PTYPE_UNKNOWN;
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        struct ipv4_hdr *ipv4_hdr;
        struct ipv6_hdr *ipv6_hdr;
-       struct vlan_hdr *vlan_hdr;
+       struct rte_vlan_hdr *vlan_hdr;
        uint16_t ethertype;
        bool vlan_tagged = 0;
        uint16_t len;
 
-       eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
-       len = sizeof(struct ether_hdr);
+       eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
+       len = sizeof(struct rte_ether_hdr);
        ethertype = rte_cpu_to_be_16(eth_hdr->ether_type);
 
         /* Note: Valid only if VLAN stripping is disabled */
-       if (ethertype == ETHER_TYPE_VLAN) {
+       if (ethertype == RTE_ETHER_TYPE_VLAN) {
                vlan_tagged = 1;
-               vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1);
-               len += sizeof(struct vlan_hdr);
+               vlan_hdr = (struct rte_vlan_hdr *)(eth_hdr + 1);
+               len += sizeof(struct rte_vlan_hdr);
                ethertype = rte_cpu_to_be_16(vlan_hdr->eth_proto);
        }
 
-       if (ethertype == ETHER_TYPE_IPv4) {
+       if (ethertype == RTE_ETHER_TYPE_IPv4) {
                packet_type |= RTE_PTYPE_L3_IPV4;
                ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, len);
                if (ipv4_hdr->next_proto_id == IPPROTO_TCP)
                        packet_type |= RTE_PTYPE_L4_TCP;
                else if (ipv4_hdr->next_proto_id == IPPROTO_UDP)
                        packet_type |= RTE_PTYPE_L4_UDP;
-       } else if (ethertype == ETHER_TYPE_IPv6) {
+       } else if (ethertype == RTE_ETHER_TYPE_IPv6) {
                packet_type |= RTE_PTYPE_L3_IPV6;
                ipv6_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *, len);
                if (ipv6_hdr->proto == IPPROTO_TCP)
@@ -1153,7 +1153,7 @@ qede_check_notunn_csum_l3(struct rte_mbuf *m, uint16_t flag)
                m->packet_type = qede_rx_cqe_to_pkt_type(flag);
                if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
                        ip = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
-                                          sizeof(struct ether_hdr));
+                                          sizeof(struct rte_ether_hdr));
                        pkt_csum = ip->hdr_checksum;
                        ip->hdr_checksum = 0;
                        calc_csum = rte_ipv4_cksum(ip);
@@ -1420,13 +1420,6 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        uint32_t rss_hash;
        int rx_alloc_count = 0;
 
-       hw_comp_cons = rte_le_to_cpu_16(*rxq->hw_cons_ptr);
-       sw_comp_cons = ecore_chain_get_cons_idx(&rxq->rx_comp_ring);
-
-       rte_rmb();
-
-       if (hw_comp_cons == sw_comp_cons)
-               return 0;
 
        /* Allocate buffers that we used in previous loop */
        if (rxq->rx_alloc_count) {
@@ -1447,6 +1440,14 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                rxq->rx_alloc_count = 0;
        }
 
+       hw_comp_cons = rte_le_to_cpu_16(*rxq->hw_cons_ptr);
+       sw_comp_cons = ecore_chain_get_cons_idx(&rxq->rx_comp_ring);
+
+       rte_rmb();
+
+       if (hw_comp_cons == sw_comp_cons)
+               return 0;
+
        while (sw_comp_cons != hw_comp_cons) {
                ol_flags = 0;
                packet_type = RTE_PTYPE_UNKNOWN;
@@ -1819,7 +1820,7 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts,
                                    temp == PKT_TX_TUNNEL_GENEVE ||
                                    temp == PKT_TX_TUNNEL_MPLSINUDP ||
                                    temp == PKT_TX_TUNNEL_GRE)
-                                       break;
+                                       continue;
                        }
 
                        rte_errno = -ENOTSUP;