net: add rte prefix to IP structure

[dpdk.git] / app / test-pmd / csumonly.c

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 481b91a..9e6630e 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -92,15 +92,15 @@ struct simple_gre_hdr {
 static uint16_t
 get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype)
 {
-       if (ethertype == _htons(ETHER_TYPE_IPv4))
+       if (ethertype == _htons(RTE_ETHER_TYPE_IPv4))
                return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr);
-       else /* assume ethertype == ETHER_TYPE_IPv6 */
+       else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */
                return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr);
 }
 
 /* Parse an IPv4 header to fill l3_len, l4_len, and l4_proto */
 static void
-parse_ipv4(struct ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)
+parse_ipv4(struct rte_ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)
 {
        struct tcp_hdr *tcp_hdr;
 
@@ -119,11 +119,11 @@ parse_ipv4(struct ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)
 
 /* Parse an IPv6 header to fill l3_len, l4_len, and l4_proto */
 static void
-parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
+parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
 {
        struct tcp_hdr *tcp_hdr;
 
-       info->l3_len = sizeof(struct ipv6_hdr);
+       info->l3_len = sizeof(struct rte_ipv6_hdr);
        info->l4_proto = ipv6_hdr->proto;
 
        /* only fill l4_len for TCP, it's useful for TSO */
@@ -144,13 +144,13 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
 static void
 parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
 {
-       struct ipv4_hdr *ipv4_hdr;
-       struct ipv6_hdr *ipv6_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
 
        info->l2_len = sizeof(struct rte_ether_hdr);
        info->ethertype = eth_hdr->ether_type;
 
-       if (info->ethertype == _htons(ETHER_TYPE_VLAN)) {
+       if (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN)) {
                struct rte_vlan_hdr *vlan_hdr = (
                        struct rte_vlan_hdr *)(eth_hdr + 1);
 
@@ -159,12 +159,14 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
        }
 
        switch (info->ethertype) {
-       case _htons(ETHER_TYPE_IPv4):
-               ipv4_hdr = (struct ipv4_hdr *) ((char *)eth_hdr + info->l2_len);
+       case _htons(RTE_ETHER_TYPE_IPv4):
+               ipv4_hdr = (struct rte_ipv4_hdr *)
+                       ((char *)eth_hdr + info->l2_len);
                parse_ipv4(ipv4_hdr, info);
                break;
-       case _htons(ETHER_TYPE_IPv6):
-               ipv6_hdr = (struct ipv6_hdr *) ((char *)eth_hdr + info->l2_len);
+       case _htons(RTE_ETHER_TYPE_IPv6):
+               ipv6_hdr = (struct rte_ipv6_hdr *)
+                       ((char *)eth_hdr + info->l2_len);
                parse_ipv6(ipv6_hdr, info);
                break;
        default:
@@ -201,7 +203,7 @@ parse_vxlan(struct udp_hdr *udp_hdr,
                sizeof(struct rte_vxlan_hdr));
 
        parse_ethernet(eth_hdr, info);
-       info->l2_len += ETHER_VXLAN_HLEN; /* add udp + vxlan */
+       info->l2_len += RTE_ETHER_VXLAN_HLEN; /* add udp + vxlan */
 }
 
 /* Parse a vxlan-gpe header */
@@ -210,8 +212,8 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,
            struct testpmd_offload_info *info)
 {
        struct rte_ether_hdr *eth_hdr;
-       struct ipv4_hdr *ipv4_hdr;
-       struct ipv6_hdr *ipv6_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
        struct rte_vxlan_gpe_hdr *vxlan_gpe_hdr;
        uint8_t vxlan_gpe_len = sizeof(*vxlan_gpe_hdr);
 
@@ -223,35 +225,35 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,
                                sizeof(struct udp_hdr));
 
        if (!vxlan_gpe_hdr->proto || vxlan_gpe_hdr->proto ==
-           VXLAN_GPE_TYPE_IPV4) {
+           RTE_VXLAN_GPE_TYPE_IPV4) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv4_hdr = (struct ipv4_hdr *)((char *)vxlan_gpe_hdr +
+               ipv4_hdr = (struct rte_ipv4_hdr *)((char *)vxlan_gpe_hdr +
                           vxlan_gpe_len);
 
                parse_ipv4(ipv4_hdr, info);
-               info->ethertype = _htons(ETHER_TYPE_IPv4);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPv4);
                info->l2_len = 0;
 
-       } else if (vxlan_gpe_hdr->proto == VXLAN_GPE_TYPE_IPV6) {
+       } else if (vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_IPV6) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv6_hdr = (struct ipv6_hdr *)((char *)vxlan_gpe_hdr +
+               ipv6_hdr = (struct rte_ipv6_hdr *)((char *)vxlan_gpe_hdr +
                           vxlan_gpe_len);
 
-               info->ethertype = _htons(ETHER_TYPE_IPv6);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPv6);
                parse_ipv6(ipv6_hdr, info);
                info->l2_len = 0;
 
-       } else if (vxlan_gpe_hdr->proto == VXLAN_GPE_TYPE_ETH) {
+       } else if (vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_ETH) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
@@ -265,7 +267,7 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,
        } else
                return;
 
-       info->l2_len += ETHER_VXLAN_GPE_HLEN;
+       info->l2_len += RTE_ETHER_VXLAN_GPE_HLEN;
 }
 
 /* Parse a gre header */
@@ -273,8 +275,8 @@ static void
 parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
 {
        struct rte_ether_hdr *eth_hdr;
-       struct ipv4_hdr *ipv4_hdr;
-       struct ipv6_hdr *ipv6_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
        uint8_t gre_len = 0;
 
        gre_len += sizeof(struct simple_gre_hdr);
@@ -286,33 +288,33 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
        if (gre_hdr->flags & _htons(GRE_CHECKSUM_PRESENT))
                gre_len += GRE_EXT_LEN;
 
-       if (gre_hdr->proto == _htons(ETHER_TYPE_IPv4)) {
+       if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPv4)) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv4_hdr = (struct ipv4_hdr *)((char *)gre_hdr + gre_len);
+               ipv4_hdr = (struct rte_ipv4_hdr *)((char *)gre_hdr + gre_len);
 
                parse_ipv4(ipv4_hdr, info);
-               info->ethertype = _htons(ETHER_TYPE_IPv4);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPv4);
                info->l2_len = 0;
 
-       } else if (gre_hdr->proto == _htons(ETHER_TYPE_IPv6)) {
+       } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPv6)) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv6_hdr = (struct ipv6_hdr *)((char *)gre_hdr + gre_len);
+               ipv6_hdr = (struct rte_ipv6_hdr *)((char *)gre_hdr + gre_len);
 
-               info->ethertype = _htons(ETHER_TYPE_IPv6);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPv6);
                parse_ipv6(ipv6_hdr, info);
                info->l2_len = 0;
 
-       } else if (gre_hdr->proto == _htons(ETHER_TYPE_TEB)) {
+       } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_TEB)) {
                info->is_tunnel = 1;
                info->outer_ethertype = info->ethertype;
                info->outer_l2_len = info->l2_len;
@@ -333,8 +335,8 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
 static void
 parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info)
 {
-       struct ipv4_hdr *ipv4_hdr = encap_ip;
-       struct ipv6_hdr *ipv6_hdr = encap_ip;
+       struct rte_ipv4_hdr *ipv4_hdr = encap_ip;
+       struct rte_ipv6_hdr *ipv6_hdr = encap_ip;
        uint8_t ip_version;
 
        ip_version = (ipv4_hdr->version_ihl & 0xf0) >> 4;
@@ -349,10 +351,10 @@ parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info)
 
        if (ip_version == 4) {
                parse_ipv4(ipv4_hdr, info);
-               info->ethertype = _htons(ETHER_TYPE_IPv4);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPv4);
        } else {
                parse_ipv6(ipv6_hdr, info);
-               info->ethertype = _htons(ETHER_TYPE_IPv6);
+               info->ethertype = _htons(RTE_ETHER_TYPE_IPv6);
        }
        info->l2_len = 0;
 }
@@ -363,7 +365,7 @@ static uint64_t
 process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
        uint64_t tx_offloads)
 {
-       struct ipv4_hdr *ipv4_hdr = l3_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr = l3_hdr;
        struct udp_hdr *udp_hdr;
        struct tcp_hdr *tcp_hdr;
        struct sctp_hdr *sctp_hdr;
@@ -384,7 +386,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
                        tso_segsz = info->tunnel_tso_segsz;
        }
 
-       if (info->ethertype == _htons(ETHER_TYPE_IPv4)) {
+       if (info->ethertype == _htons(RTE_ETHER_TYPE_IPv4)) {
                ipv4_hdr = l3_hdr;
                ipv4_hdr->hdr_checksum = 0;
 
@@ -398,7 +400,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
                                ipv4_hdr->hdr_checksum =
                                        rte_ipv4_cksum(ipv4_hdr);
                }
-       } else if (info->ethertype == _htons(ETHER_TYPE_IPv6))
+       } else if (info->ethertype == _htons(RTE_ETHER_TYPE_IPv6))
                ol_flags |= PKT_TX_IPV6;
        else
                return 0; /* packet type not supported, nothing to do */
@@ -454,12 +456,12 @@ static uint64_t
 process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
        uint64_t tx_offloads, int tso_enabled)
 {
-       struct ipv4_hdr *ipv4_hdr = outer_l3_hdr;
-       struct ipv6_hdr *ipv6_hdr = outer_l3_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr = outer_l3_hdr;
        struct udp_hdr *udp_hdr;
        uint64_t ol_flags = 0;
 
-       if (info->outer_ethertype == _htons(ETHER_TYPE_IPv4)) {
+       if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPv4)) {
                ipv4_hdr->hdr_checksum = 0;
                ol_flags |= PKT_TX_OUTER_IPV4;
 
@@ -495,7 +497,7 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
        /* do not recalculate udp cksum if it was 0 */
        if (udp_hdr->dgram_cksum != 0) {
                udp_hdr->dgram_cksum = 0;
-               if (info->outer_ethertype == _htons(ETHER_TYPE_IPv4))
+               if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPv4))
                        udp_hdr->dgram_cksum =
                                rte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr);
                else
@@ -767,9 +769,9 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                 * and inner headers */
 
                eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
-               ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
+               rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
                                &eth_hdr->d_addr);
-               ether_addr_copy(&ports[fs->tx_port].eth_addr,
+               rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
                                &eth_hdr->s_addr);
                parse_ethernet(eth_hdr, &info);
                l3_hdr = (char *)eth_hdr + info.l2_len;