net: add rte prefix to IP structure

[dpdk.git] / lib / librte_net / rte_net.c

diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c
index 315c37c..b01cacb 100644 (file)
--- a/lib/librte_net/rte_net.c
+++ b/lib/librte_net/rte_net.c
@@ -140,8 +140,8 @@ ptype_tunnel(uint16_t *proto, const struct rte_mbuf *m,
                        [0xa] = 12,
                        [0xb] = 16,
                };
-               const struct gre_hdr *gh;
-               struct gre_hdr gh_copy;
+               const struct rte_gre_hdr *gh;
+               struct rte_gre_hdr gh_copy;
                uint16_t flags;
 
                gh = rte_pktmbuf_read(m, *off, sizeof(*gh), &gh_copy);
@@ -155,16 +155,16 @@ ptype_tunnel(uint16_t *proto, const struct rte_mbuf *m,
 
                *off += opt_len[flags];
                *proto = gh->proto;
-               if (*proto == rte_cpu_to_be_16(ETHER_TYPE_TEB))
+               if (*proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_TEB))
                        return RTE_PTYPE_TUNNEL_NVGRE;
                else
                        return RTE_PTYPE_TUNNEL_GRE;
        }
        case IPPROTO_IPIP:
-               *proto = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+               *proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);
                return RTE_PTYPE_TUNNEL_IP;
        case IPPROTO_IPV6:
-               *proto = rte_cpu_to_be_16(ETHER_TYPE_IPv6);
+               *proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6);
                return RTE_PTYPE_TUNNEL_IP; /* IP is also valid for IPv6 */
        default:
                return 0;
@@ -173,7 +173,7 @@ ptype_tunnel(uint16_t *proto, const struct rte_mbuf *m,
 
 /* get the ipv4 header length */
 static uint8_t
-ip4_hlen(const struct ipv4_hdr *hdr)
+ip4_hlen(const struct rte_ipv4_hdr *hdr)
 {
        return (hdr->version_ihl & 0xf) * 4;
 }
@@ -249,10 +249,10 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,
        if ((layers & RTE_PTYPE_L2_MASK) == 0)
                return 0;
 
-       if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
+       if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4))
                goto l3; /* fast path if packet is IPv4 */
 
-       if (proto == rte_cpu_to_be_16(ETHER_TYPE_VLAN)) {
+       if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) {
                const struct rte_vlan_hdr *vh;
                struct rte_vlan_hdr vh_copy;
 
@@ -263,7 +263,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,
                off += sizeof(*vh);
                hdr_lens->l2_len += sizeof(*vh);
                proto = vh->eth_proto;
-       } else if (proto == rte_cpu_to_be_16(ETHER_TYPE_QINQ)) {
+       } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_QINQ)) {
                const struct rte_vlan_hdr *vh;
                struct rte_vlan_hdr vh_copy;
 
@@ -275,8 +275,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,
                off += 2 * sizeof(*vh);
                hdr_lens->l2_len += 2 * sizeof(*vh);
                proto = vh->eth_proto;
-       } else if ((proto == rte_cpu_to_be_16(ETHER_TYPE_MPLS)) ||
-               (proto == rte_cpu_to_be_16(ETHER_TYPE_MPLSM))) {
+       } else if ((proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLS)) ||
+               (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLSM))) {
                unsigned int i;
                const struct mpls_hdr *mh;
                struct mpls_hdr mh_copy;
@@ -299,9 +299,9 @@ l3:
        if ((layers & RTE_PTYPE_L3_MASK) == 0)
                return pkt_type;
 
-       if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) {
-               const struct ipv4_hdr *ip4h;
-               struct ipv4_hdr ip4h_copy;
+       if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {
+               const struct rte_ipv4_hdr *ip4h;
+               struct rte_ipv4_hdr ip4h_copy;
 
                ip4h = rte_pktmbuf_read(m, off, sizeof(*ip4h), &ip4h_copy);
                if (unlikely(ip4h == NULL))
@@ -322,9 +322,9 @@ l3:
                }
                proto = ip4h->next_proto_id;
                pkt_type |= ptype_l4(proto);
-       } else if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv6)) {
-               const struct ipv6_hdr *ip6h;
-               struct ipv6_hdr ip6h_copy;
+       } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {
+               const struct rte_ipv6_hdr *ip6h;
+               struct rte_ipv6_hdr ip6h_copy;
                int frag = 0;
 
                ip6h = rte_pktmbuf_read(m, off, sizeof(*ip6h), &ip6h_copy);
@@ -391,7 +391,7 @@ l3:
                return pkt_type;
 
        hdr_lens->inner_l2_len = 0;
-       if (proto == rte_cpu_to_be_16(ETHER_TYPE_TEB)) {
+       if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_TEB)) {
                eh = rte_pktmbuf_read(m, off, sizeof(*eh), &eh_copy);
                if (unlikely(eh == NULL))
                        return pkt_type;
@@ -401,7 +401,7 @@ l3:
                hdr_lens->inner_l2_len = sizeof(*eh);
        }
 
-       if (proto == rte_cpu_to_be_16(ETHER_TYPE_VLAN)) {
+       if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) {
                const struct rte_vlan_hdr *vh;
                struct rte_vlan_hdr vh_copy;
 
@@ -413,7 +413,7 @@ l3:
                off += sizeof(*vh);
                hdr_lens->inner_l2_len += sizeof(*vh);
                proto = vh->eth_proto;
-       } else if (proto == rte_cpu_to_be_16(ETHER_TYPE_QINQ)) {
+       } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_QINQ)) {
                const struct rte_vlan_hdr *vh;
                struct rte_vlan_hdr vh_copy;
 
@@ -431,9 +431,9 @@ l3:
        if ((layers & RTE_PTYPE_INNER_L3_MASK) == 0)
                return pkt_type;
 
-       if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) {
-               const struct ipv4_hdr *ip4h;
-               struct ipv4_hdr ip4h_copy;
+       if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {
+               const struct rte_ipv4_hdr *ip4h;
+               struct rte_ipv4_hdr ip4h_copy;
 
                ip4h = rte_pktmbuf_read(m, off, sizeof(*ip4h), &ip4h_copy);
                if (unlikely(ip4h == NULL))
@@ -454,9 +454,9 @@ l3:
                }
                proto = ip4h->next_proto_id;
                pkt_type |= ptype_inner_l4(proto);
-       } else if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv6)) {
-               const struct ipv6_hdr *ip6h;
-               struct ipv6_hdr ip6h_copy;
+       } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {
+               const struct rte_ipv6_hdr *ip6h;
+               struct rte_ipv6_hdr ip6h_copy;
                int frag = 0;
 
                ip6h = rte_pktmbuf_read(m, off, sizeof(*ip6h), &ip6h_copy);