net: add rte prefix to SCTP 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 d858ab1..4a46df5 100644 (file)
--- a/lib/librte_net/rte_net.c
+++ b/lib/librte_net/rte_net.c
@@ -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;
 }
@@ -300,8 +300,8 @@ l3:
                return pkt_type;
 
        if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {
-               const struct ipv4_hdr *ip4h;
-               struct ipv4_hdr ip4h_copy;
+               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))
@@ -315,7 +315,7 @@ l3:
                        return pkt_type;
 
                if (ip4h->fragment_offset & rte_cpu_to_be_16(
-                               IPV4_HDR_OFFSET_MASK | IPV4_HDR_MF_FLAG)) {
+                               RTE_IPV4_HDR_OFFSET_MASK | RTE_IPV4_HDR_MF_FLAG)) {
                        pkt_type |= RTE_PTYPE_L4_FRAG;
                        hdr_lens->l4_len = 0;
                        return pkt_type;
@@ -323,8 +323,8 @@ l3:
                proto = ip4h->next_proto_id;
                pkt_type |= ptype_l4(proto);
        } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {
-               const struct ipv6_hdr *ip6h;
-               struct ipv6_hdr ip6h_copy;
+               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);
@@ -370,7 +370,7 @@ l3:
                hdr_lens->l4_len = (th->data_off & 0xf0) >> 2;
                return pkt_type;
        } else if ((pkt_type & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_SCTP) {
-               hdr_lens->l4_len = sizeof(struct sctp_hdr);
+               hdr_lens->l4_len = sizeof(struct rte_sctp_hdr);
                return pkt_type;
        } else {
                uint32_t prev_off = off;
@@ -432,8 +432,8 @@ l3:
                return pkt_type;
 
        if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {
-               const struct ipv4_hdr *ip4h;
-               struct ipv4_hdr ip4h_copy;
+               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))
@@ -446,8 +446,8 @@ l3:
                if ((layers & RTE_PTYPE_INNER_L4_MASK) == 0)
                        return pkt_type;
                if (ip4h->fragment_offset &
-                               rte_cpu_to_be_16(IPV4_HDR_OFFSET_MASK |
-                                       IPV4_HDR_MF_FLAG)) {
+                               rte_cpu_to_be_16(RTE_IPV4_HDR_OFFSET_MASK |
+                                       RTE_IPV4_HDR_MF_FLAG)) {
                        pkt_type |= RTE_PTYPE_INNER_L4_FRAG;
                        hdr_lens->inner_l4_len = 0;
                        return pkt_type;
@@ -455,8 +455,8 @@ l3:
                proto = ip4h->next_proto_id;
                pkt_type |= ptype_inner_l4(proto);
        } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) {
-               const struct ipv6_hdr *ip6h;
-               struct ipv6_hdr ip6h_copy;
+               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);
@@ -506,7 +506,7 @@ l3:
                hdr_lens->inner_l4_len = (th->data_off & 0xf0) >> 2;
        } else if ((pkt_type & RTE_PTYPE_INNER_L4_MASK) ==
                        RTE_PTYPE_INNER_L4_SCTP) {
-               hdr_lens->inner_l4_len = sizeof(struct sctp_hdr);
+               hdr_lens->inner_l4_len = sizeof(struct rte_sctp_hdr);
        } else {
                hdr_lens->inner_l4_len = 0;
        }