net: add rte prefix to ether defines

[dpdk.git] / examples / l3fwd / l3fwd_em.c

diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 9dc3b8c..b56b086 100644 (file)
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -18,7 +18,6 @@
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_mempool.h>
 #include <rte_cycles.h>
 #include <rte_mbuf.h>
 #include <rte_ip.h>
@@ -562,7 +561,7 @@ em_check_ptype(int portid)
 static inline void
 em_parse_ptype(struct rte_mbuf *m)
 {
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        uint32_t packet_type = RTE_PTYPE_UNKNOWN;
        uint16_t ether_type;
        void *l3;
@@ -570,10 +569,10 @@ em_parse_ptype(struct rte_mbuf *m)
        struct ipv4_hdr *ipv4_hdr;
        struct ipv6_hdr *ipv6_hdr;
 
-       eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
        ether_type = eth_hdr->ether_type;
-       l3 = (uint8_t *)eth_hdr + sizeof(struct ether_hdr);
-       if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) {
+       l3 = (uint8_t *)eth_hdr + sizeof(struct rte_ether_hdr);
+       if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {
                ipv4_hdr = (struct ipv4_hdr *)l3;
                hdr_len = (ipv4_hdr->version_ihl & IPV4_HDR_IHL_MASK) *
                          IPV4_IHL_MULTIPLIER;
@@ -585,7 +584,7 @@ em_parse_ptype(struct rte_mbuf *m)
                                packet_type |= RTE_PTYPE_L4_UDP;
                } else
                        packet_type |= RTE_PTYPE_L3_IPV4_EXT;
-       } else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv6)) {
+       } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {
                ipv6_hdr = (struct ipv6_hdr *)l3;
                if (ipv6_hdr->proto == IPPROTO_TCP)
                        packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP;