net: add rte prefix to ether functions

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

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index dce4b9b..8de37c8 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -111,7 +111,9 @@ parse_ipv4(struct ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)
        if (info->l4_proto == IPPROTO_TCP) {
                tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr + info->l3_len);
                info->l4_len = (tcp_hdr->data_off & 0xf0) >> 2;
-       } else
+       } else if (info->l4_proto == IPPROTO_UDP)
+               info->l4_len = sizeof(struct udp_hdr);
+       else
                info->l4_len = 0;
 }
 
@@ -128,7 +130,9 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
        if (info->l4_proto == IPPROTO_TCP) {
                tcp_hdr = (struct tcp_hdr *)((char *)ipv6_hdr + info->l3_len);
                info->l4_len = (tcp_hdr->data_off & 0xf0) >> 2;
-       } else
+       } else if (info->l4_proto == IPPROTO_UDP)
+               info->l4_len = sizeof(struct udp_hdr);
+       else
                info->l4_len = 0;
 }
 
@@ -138,18 +142,19 @@ 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);
+               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;
        }
 
@@ -176,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
@@ -191,9 +196,9 @@ 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 */
@@ -204,17 +209,17 @@ 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 ==
@@ -253,7 +258,7 @@ parse_vxlan_gpe(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 *)vxlan_gpe_hdr +
+               eth_hdr = (struct rte_ether_hdr *)((char *)vxlan_gpe_hdr +
                          vxlan_gpe_len);
 
                parse_ethernet(eth_hdr, info);
@@ -267,7 +272,7 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,
 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;
@@ -314,7 +319,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
                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
@@ -571,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)
@@ -687,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;
@@ -761,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;