net: add rte prefix to ether defines

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

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index ffeee20..d1344b9 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -92,9 +92,9 @@ 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);
 }
 
@@ -142,27 +142,28 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
  * header. The l4_len argument is only set in case of TCP (useful for TSO).
  */
 static void
-parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)
+parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
 {
        struct ipv4_hdr *ipv4_hdr;
        struct ipv6_hdr *ipv6_hdr;
 
-       info->l2_len = sizeof(struct ether_hdr);
+       info->l2_len = sizeof(struct rte_ether_hdr);
        info->ethertype = eth_hdr->ether_type;
 
-       if (info->ethertype == _htons(ETHER_TYPE_VLAN)) {
-               struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1);
+       if (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN)) {
+               struct rte_vlan_hdr *vlan_hdr = (
+                       struct rte_vlan_hdr *)(eth_hdr + 1);
 
-               info->l2_len  += sizeof(struct vlan_hdr);
+               info->l2_len  += sizeof(struct rte_vlan_hdr);
                info->ethertype = vlan_hdr->eth_proto;
        }
 
        switch (info->ethertype) {
-       case _htons(ETHER_TYPE_IPv4):
+       case _htons(RTE_ETHER_TYPE_IPv4):
                ipv4_hdr = (struct ipv4_hdr *) ((char *)eth_hdr + info->l2_len);
                parse_ipv4(ipv4_hdr, info);
                break;
-       case _htons(ETHER_TYPE_IPv6):
+       case _htons(RTE_ETHER_TYPE_IPv6):
                ipv6_hdr = (struct ipv6_hdr *) ((char *)eth_hdr + info->l2_len);
                parse_ipv6(ipv6_hdr, info);
                break;
@@ -180,7 +181,7 @@ parse_vxlan(struct udp_hdr *udp_hdr,
            struct testpmd_offload_info *info,
            uint32_t pkt_type)
 {
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
 
        /* check udp destination port, 4789 is the default vxlan port
         * (rfc7348) or that the rx offload flag is set (i40e only
@@ -195,12 +196,12 @@ parse_vxlan(struct udp_hdr *udp_hdr,
        info->outer_l3_len = info->l3_len;
        info->outer_l4_proto = info->l4_proto;
 
-       eth_hdr = (struct ether_hdr *)((char *)udp_hdr +
+       eth_hdr = (struct rte_ether_hdr *)((char *)udp_hdr +
                sizeof(struct udp_hdr) +
-               sizeof(struct vxlan_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 */
@@ -208,21 +209,21 @@ static void
 parse_vxlan_gpe(struct udp_hdr *udp_hdr,
            struct testpmd_offload_info *info)
 {
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        struct ipv4_hdr *ipv4_hdr;
        struct ipv6_hdr *ipv6_hdr;
-       struct vxlan_gpe_hdr *vxlan_gpe_hdr;
+       struct rte_vxlan_gpe_hdr *vxlan_gpe_hdr;
        uint8_t vxlan_gpe_len = sizeof(*vxlan_gpe_hdr);
 
        /* Check udp destination port. */
        if (udp_hdr->dst_port != _htons(vxlan_gpe_udp_port))
                return;
 
-       vxlan_gpe_hdr = (struct vxlan_gpe_hdr *)((char *)udp_hdr +
+       vxlan_gpe_hdr = (struct rte_vxlan_gpe_hdr *)((char *)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;
@@ -233,10 +234,10 @@ parse_vxlan_gpe(struct udp_hdr *udp_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;
@@ -246,32 +247,32 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,
                ipv6_hdr = (struct 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;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               eth_hdr = (struct ether_hdr *)((char *)vxlan_gpe_hdr +
+               eth_hdr = (struct rte_ether_hdr *)((char *)vxlan_gpe_hdr +
                          vxlan_gpe_len);
 
                parse_ethernet(eth_hdr, info);
        } else
                return;
 
-       info->l2_len += ETHER_VXLAN_GPE_HLEN;
+       info->l2_len += RTE_ETHER_VXLAN_GPE_HLEN;
 }
 
 /* Parse a gre header */
 static void
 parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
 {
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        struct ipv4_hdr *ipv4_hdr;
        struct ipv6_hdr *ipv6_hdr;
        uint8_t gre_len = 0;
@@ -285,7 +286,7 @@ 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;
@@ -295,10 +296,10 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
                ipv4_hdr = (struct 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;
@@ -307,18 +308,18 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
 
                ipv6_hdr = (struct 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;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               eth_hdr = (struct ether_hdr *)((char *)gre_hdr + gre_len);
+               eth_hdr = (struct rte_ether_hdr *)((char *)gre_hdr + gre_len);
 
                parse_ethernet(eth_hdr, info);
        } else
@@ -348,10 +349,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;
 }
@@ -383,7 +384,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;
 
@@ -397,7 +398,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 */
@@ -458,7 +459,7 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
        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;
 
@@ -494,7 +495,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
@@ -575,7 +576,7 @@ mbuf_copy_split(const struct rte_mbuf *ms, struct rte_mbuf *md[],
 
 /*
  * Allocate a new mbuf with up to tx_pkt_nb_segs segments.
- * Copy packet contents and offload information into then new segmented mbuf.
+ * Copy packet contents and offload information into the new segmented mbuf.
  */
 static struct rte_mbuf *
 pkt_copy_split(const struct rte_mbuf *pkt)
@@ -691,7 +692,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
        struct rte_mbuf **tx_pkts_burst;
        struct rte_port *txp;
        struct rte_mbuf *m, *p;
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        void *l3_hdr = NULL, *outer_l3_hdr = NULL; /* can be IPv4 or IPv6 */
        void **gro_ctx;
        uint16_t gro_pkts_num;
@@ -765,10 +766,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                /* step 1: dissect packet, parsing optional vlan, ip4/ip6, vxlan
                 * and inner headers */
 
-               eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
-               ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
+               eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
+               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;