From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 60F8DA0465 for ; Wed, 29 May 2019 13:30:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0B1641B9A7; Wed, 29 May 2019 13:30:20 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id EBEAC1B993 for ; Wed, 29 May 2019 13:30:16 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5CF81306CA50; Wed, 29 May 2019 11:30:09 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-214.brq.redhat.com [10.40.204.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8737F277BE; Wed, 29 May 2019 11:29:54 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: ferruh.yigit@intel.com, thomas@monjalon.net, olivier.matz@6wind.com, maxime.coquelin@redhat.com, stephen@networkplumber.org, Adrien Mazarguil , Wenzhuo Lu , Jingjing Wu , Bernard Iremonger , Chas Williams , Cristian Dumitrescu , Marko Kovacevic , Ori Kam , Bruce Richardson , Pablo de Lara , Radu Nicolau , Akhil Goyal , Tomasz Kantecki , John McNamara , Ajit Khaparde , Somnath Kotur , Rahul Lakkireddy , Hemant Agrawal , Shreyansh Jain , John Daley , Hyong Youb Kim , Beilei Xing , Qi Zhang , Konstantin Ananyev , Shahaf Shuler , Yongseok Koh , Rasesh Mody , Shahed Shaikh , Keith Wiles , Declan Doherty , David Hunt , Harry van Haaren , Xiaoyun Li , Nikhil Rao , Jerin Jacob , Tiwei Bie , Zhihong Wang Date: Wed, 29 May 2019 13:29:17 +0200 Message-Id: <1559129358-2935-4-git-send-email-david.marchand@redhat.com> In-Reply-To: <1559129358-2935-1-git-send-email-david.marchand@redhat.com> References: <1559129358-2935-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 29 May 2019 11:30:13 +0000 (UTC) Subject: [dpdk-dev] [PATCH 4/5] replace RTE_ETHER_TYPE_IPv4 with uppercase RTE_ETHER_TYPE_IPV4 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since we change this macro, we might as well avoid triggering complaints from checkpatch because of mixed case. old=RTE_ETHER_TYPE_IPv4 new=RTE_ETHER_TYPE_IPV4 git grep -lw $old | xargs sed -i -e "s/\<$old\>/$new/g" Signed-off-by: David Marchand --- app/test-pmd/cmdline_flow.c | 20 ++++++++++---------- app/test-pmd/csumonly.c | 18 +++++++++--------- app/test-pmd/flowgen.c | 2 +- app/test-pmd/icmpecho.c | 4 ++-- app/test-pmd/txonly.c | 2 +- app/test/packet_burst_generator.c | 6 +++--- app/test/test_flow_classify.c | 6 +++--- app/test/test_link_bonding.c | 14 +++++++------- app/test/test_pmd_perf.c | 2 +- app/test/test_sched.c | 2 +- doc/guides/sample_app_ug/ipv4_multicast.rst | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_alb.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 8 ++++---- drivers/net/cxgbe/cxgbe_flow.c | 2 +- drivers/net/dpaa/dpaa_rxtx.c | 4 ++-- drivers/net/e1000/igb_ethdev.c | 2 +- drivers/net/e1000/igb_flow.c | 2 +- drivers/net/enic/enic_flow.c | 2 +- drivers/net/i40e/i40e_ethdev.c | 2 +- drivers/net/i40e/i40e_fdir.c | 4 ++-- drivers/net/i40e/i40e_flow.c | 6 +++--- drivers/net/ixgbe/ixgbe_ethdev.c | 2 +- drivers/net/ixgbe/ixgbe_flow.c | 2 +- drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- drivers/net/qede/qede_filter.c | 6 +++--- drivers/net/qede/qede_rxtx.c | 2 +- drivers/net/tap/rte_eth_tap.c | 2 +- examples/bond/main.c | 4 ++-- examples/ip_fragmentation/main.c | 4 ++-- examples/ip_reassembly/main.c | 2 +- examples/ipsec-secgw/ipsec-secgw.c | 4 ++-- examples/ipv4_multicast/main.c | 2 +- examples/l2fwd-crypto/main.c | 2 +- examples/l3fwd-power/main.c | 2 +- examples/l3fwd/l3fwd_em.c | 2 +- examples/l3fwd/l3fwd_lpm.c | 2 +- examples/performance-thread/l3fwd-thread/main.c | 2 +- examples/tep_termination/vxlan.c | 6 +++--- examples/tep_termination/vxlan_setup.c | 2 +- lib/librte_eventdev/rte_event_eth_rx_adapter.c | 4 ++-- lib/librte_net/rte_arp.c | 2 +- lib/librte_net/rte_ether.h | 2 +- lib/librte_net/rte_net.c | 8 ++++---- lib/librte_pipeline/rte_table_action.c | 10 +++++----- lib/librte_vhost/virtio_net.c | 2 +- 46 files changed, 97 insertions(+), 97 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index a3bbadd..a0fa748 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -3682,7 +3682,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (l2_encap_conf.select_vlan) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); else if (l2_encap_conf.select_ipv4) - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(eth.dst.addr_bytes, @@ -3693,7 +3693,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, header += sizeof(eth); if (l2_encap_conf.select_vlan) { if (l2_encap_conf.select_ipv4) - vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(header, &vlan, sizeof(vlan)); @@ -3817,7 +3817,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsogre_encap_conf.select_vlan) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); else if (mplsogre_encap_conf.select_ipv4) - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(eth.dst.addr_bytes, @@ -3828,7 +3828,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, header += sizeof(eth); if (mplsogre_encap_conf.select_vlan) { if (mplsogre_encap_conf.select_ipv4) - vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(header, &vlan, sizeof(vlan)); @@ -3912,7 +3912,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsogre_decap_conf.select_vlan) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); else if (mplsogre_encap_conf.select_ipv4) - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(eth.dst.addr_bytes, @@ -3923,7 +3923,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, header += sizeof(eth); if (mplsogre_encap_conf.select_vlan) { if (mplsogre_encap_conf.select_ipv4) - vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(header, &vlan, sizeof(vlan)); @@ -4008,7 +4008,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsoudp_encap_conf.select_vlan) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); else if (mplsoudp_encap_conf.select_ipv4) - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(eth.dst.addr_bytes, @@ -4019,7 +4019,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, header += sizeof(eth); if (mplsoudp_encap_conf.select_vlan) { if (mplsoudp_encap_conf.select_ipv4) - vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(header, &vlan, sizeof(vlan)); @@ -4105,7 +4105,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsoudp_decap_conf.select_vlan) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); else if (mplsoudp_encap_conf.select_ipv4) - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(eth.dst.addr_bytes, @@ -4116,7 +4116,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, header += sizeof(eth); if (mplsoudp_encap_conf.select_vlan) { if (mplsoudp_encap_conf.select_ipv4) - vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); memcpy(header, &vlan, sizeof(vlan)); diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 105c7f2..3732fd1 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -92,7 +92,7 @@ struct simple_gre_hdr { static uint16_t get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype) { - if (ethertype == _htons(RTE_ETHER_TYPE_IPv4)) + if (ethertype == _htons(RTE_ETHER_TYPE_IPV4)) return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr); else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr); @@ -161,7 +161,7 @@ struct simple_gre_hdr { } switch (info->ethertype) { - case _htons(RTE_ETHER_TYPE_IPv4): + case _htons(RTE_ETHER_TYPE_IPV4): ipv4_hdr = (struct rte_ipv4_hdr *) ((char *)eth_hdr + info->l2_len); parse_ipv4(ipv4_hdr, info); @@ -238,7 +238,7 @@ struct simple_gre_hdr { vxlan_gpe_len); parse_ipv4(ipv4_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv4); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); info->l2_len = 0; } else if (vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_IPV6) { @@ -290,7 +290,7 @@ struct simple_gre_hdr { if (gre_hdr->flags & _htons(GRE_CHECKSUM_PRESENT)) gre_len += GRE_EXT_LEN; - if (gre_hdr->proto == _htons(RTE_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; @@ -300,7 +300,7 @@ struct simple_gre_hdr { ipv4_hdr = (struct rte_ipv4_hdr *)((char *)gre_hdr + gre_len); parse_ipv4(ipv4_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv4); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); info->l2_len = 0; } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPv6)) { @@ -353,7 +353,7 @@ struct simple_gre_hdr { if (ip_version == 4) { parse_ipv4(ipv4_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv4); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); } else { parse_ipv6(ipv6_hdr, info); info->ethertype = _htons(RTE_ETHER_TYPE_IPv6); @@ -388,7 +388,7 @@ struct simple_gre_hdr { tso_segsz = info->tunnel_tso_segsz; } - if (info->ethertype == _htons(RTE_ETHER_TYPE_IPv4)) { + if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV4)) { ipv4_hdr = l3_hdr; ipv4_hdr->hdr_checksum = 0; @@ -464,7 +464,7 @@ struct simple_gre_hdr { struct rte_udp_hdr *udp_hdr; uint64_t ol_flags = 0; - if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPv4)) { + if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) { ipv4_hdr->hdr_checksum = 0; ol_flags |= PKT_TX_OUTER_IPV4; @@ -501,7 +501,7 @@ struct simple_gre_hdr { /* 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(RTE_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 diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 1e424a1..ade6fe5 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -173,7 +173,7 @@ eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->d_addr); rte_ether_addr_copy(&cfg_ether_src, ð_hdr->s_addr); - eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); /* Initialize IP header. */ ip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1); diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c index c055fc9..2d359c9 100644 --- a/app/test-pmd/icmpecho.c +++ b/app/test-pmd/icmpecho.c @@ -360,7 +360,7 @@ } if ((RTE_BE_TO_CPU_16(arp_h->arp_hardware) != RTE_ARP_HRD_ETHER) || - (arp_pro != RTE_ETHER_TYPE_IPv4) || + (arp_pro != RTE_ETHER_TYPE_IPV4) || (arp_h->arp_hlen != 6) || (arp_h->arp_plen != 4) ) { @@ -414,7 +414,7 @@ continue; } - if (eth_type != RTE_ETHER_TYPE_IPv4) { + if (eth_type != RTE_ETHER_TYPE_IPV4) { rte_pktmbuf_free(pkt); continue; } diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c index a37aa5a..10d641a 100644 --- a/app/test-pmd/txonly.c +++ b/app/test-pmd/txonly.c @@ -268,7 +268,7 @@ */ rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], ð_hdr.d_addr); rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, ð_hdr.s_addr); - eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); if (rte_mempool_get_bulk(mbp, (void **)pkts_burst, nb_pkt_per_burst) == 0) { diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c index 445c1df..cf22d18 100644 --- a/app/test/packet_burst_generator.c +++ b/app/test/packet_burst_generator.c @@ -82,7 +82,7 @@ uint32_t opcode) { arp_hdr->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER); - arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); arp_hdr->arp_hlen = RTE_ETHER_ADDR_LEN; arp_hdr->arp_plen = sizeof(uint32_t); arp_hdr->arp_opcode = rte_cpu_to_be_16(opcode); @@ -324,7 +324,7 @@ pkt->l2_len = eth_hdr_size; if (ipv4) { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv4; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV4; pkt->l3_len = sizeof(struct rte_ipv4_hdr); } else { pkt->vlan_tci = RTE_ETHER_TYPE_IPv6; @@ -445,7 +445,7 @@ pkt->l2_len = eth_hdr_size; if (ipv4) { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv4; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV4; pkt->l3_len = sizeof(struct rte_ipv4_hdr); } else { pkt->vlan_tci = RTE_ETHER_TYPE_IPv6; diff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c index cbbff31..6bbaad3 100644 --- a/app/test/test_flow_classify.c +++ b/app/test/test_flow_classify.c @@ -506,7 +506,7 @@ struct flow_classifier_acl { printf("Set up IPv4 UDP traffic\n"); initialize_eth_header(&pkt_eth_hdr, (struct rte_ether_addr *)src_mac, - (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPV4, 0, 0); pktlen = (uint16_t)(sizeof(struct rte_ether_hdr)); printf("ETH pktlen %u\n", pktlen); @@ -543,7 +543,7 @@ struct flow_classifier_acl { printf("Set up IPv4 TCP traffic\n"); initialize_eth_header(&pkt_eth_hdr, (struct rte_ether_addr *)src_mac, - (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPV4, 0, 0); pktlen = (uint16_t)(sizeof(struct rte_ether_hdr)); printf("ETH pktlen %u\n", pktlen); @@ -580,7 +580,7 @@ struct flow_classifier_acl { printf("Set up IPv4 SCTP traffic\n"); initialize_eth_header(&pkt_eth_hdr, (struct rte_ether_addr *)src_mac, - (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPV4, 0, 0); pktlen = (uint16_t)(sizeof(struct rte_ether_hdr)); printf("ETH pktlen %u\n", pktlen); diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c index a4d52a7..a180899 100644 --- a/app/test/test_link_bonding.c +++ b/app/test/test_link_bonding.c @@ -1272,7 +1272,7 @@ struct link_bonding_unittest_params { void *ip_hdr; if (ipv4) - ether_type = RTE_ETHER_TYPE_IPv4; + ether_type = RTE_ETHER_TYPE_IPV4; else ether_type = RTE_ETHER_TYPE_IPv6; @@ -2047,7 +2047,7 @@ struct link_bonding_unittest_params { initialize_eth_header(test_params->pkt_eth_hdr, (struct rte_ether_addr *)src_mac, (struct rte_ether_addr *)dst_mac_0, - RTE_ETHER_TYPE_IPv4, 0, 0); + RTE_ETHER_TYPE_IPV4, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr, @@ -2584,7 +2584,7 @@ struct link_bonding_unittest_params { initialize_eth_header(test_params->pkt_eth_hdr, (struct rte_ether_addr *)src_mac, (struct rte_ether_addr *)dst_mac_0, - RTE_ETHER_TYPE_IPv4, 0, 0); + RTE_ETHER_TYPE_IPV4, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); pktlen = initialize_ipv4_header(test_params->pkt_ipv4_hdr, src_addr, @@ -2600,7 +2600,7 @@ struct link_bonding_unittest_params { initialize_eth_header(test_params->pkt_eth_hdr, (struct rte_ether_addr *)src_mac, (struct rte_ether_addr *)dst_mac_1, - RTE_ETHER_TYPE_IPv4, 0, 0); + RTE_ETHER_TYPE_IPV4, 0, 0); /* Generate a burst 2 of packets to transmit */ TEST_ASSERT_EQUAL(generate_packet_burst(test_params->mbuf_pool, &pkts_burst[1][0], @@ -3426,7 +3426,7 @@ struct link_bonding_unittest_params { initialize_eth_header(test_params->pkt_eth_hdr, (struct rte_ether_addr *)src_mac, (struct rte_ether_addr *)dst_mac_0, - RTE_ETHER_TYPE_IPv4, 0, 0); + RTE_ETHER_TYPE_IPV4, 0, 0); pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); @@ -4012,12 +4012,12 @@ struct link_bonding_unittest_params { initialize_eth_header(test_params->pkt_eth_hdr, (struct rte_ether_addr *)src_mac, (struct rte_ether_addr *)dst_mac_0, - RTE_ETHER_TYPE_IPv4, 0, 0); + RTE_ETHER_TYPE_IPV4, 0, 0); } else { initialize_eth_header(test_params->pkt_eth_hdr, (struct rte_ether_addr *)test_params->default_slave_mac, (struct rte_ether_addr *)dst_mac_0, - RTE_ETHER_TYPE_IPv4, 0, 0); + RTE_ETHER_TYPE_IPV4, 0, 0); } pktlen = initialize_udp_header(test_params->pkt_udp_hdr, src_port, dst_port_0, 16); diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c index 5e2dad9..4f9fc0d 100644 --- a/app/test/test_pmd_perf.c +++ b/app/test/test_pmd_perf.c @@ -192,7 +192,7 @@ enum { initialize_eth_header(&pkt_eth_hdr, (struct rte_ether_addr *)src_mac, - (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPv4, 0, 0); + (struct rte_ether_addr *)dst_mac, RTE_ETHER_TYPE_IPV4, 0, 0); pktlen = initialize_ipv4_header(&pkt_ipv4_hdr, IPV4_ADDR(10, 0, 0, 1), diff --git a/app/test/test_sched.c b/app/test/test_sched.c index 5873ee4..49bb9ea 100644 --- a/app/test/test_sched.c +++ b/app/test/test_sched.c @@ -95,7 +95,7 @@ vlan1->vlan_tci = rte_cpu_to_be_16(SUBPORT); vlan2->vlan_tci = rte_cpu_to_be_16(PIPE); - eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); ip_hdr->dst_addr = RTE_IPV4(0,0,TC,QUEUE); diff --git a/doc/guides/sample_app_ug/ipv4_multicast.rst b/doc/guides/sample_app_ug/ipv4_multicast.rst index ea7902b..8923a7f 100644 --- a/doc/guides/sample_app_ug/ipv4_multicast.rst +++ b/doc/guides/sample_app_ug/ipv4_multicast.rst @@ -229,7 +229,7 @@ The actual packet transmission is done in the mcast_send_pkt() function: rte_ether_addr_copy(dest_addr, ðdr->d_addr); rte_ether_addr_copy(&ports_eth_addr[port], ðdr->s_addr); - ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv4); + ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); /* Put new packet into the output queue */ diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index b0244d6..42738b8 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1796,7 +1796,7 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu) int match = 0; *ret = 0; - if (efilter->ether_type == RTE_ETHER_TYPE_IPv4 || + if (efilter->ether_type == RTE_ETHER_TYPE_IPV4 || efilter->ether_type == RTE_ETHER_TYPE_IPv6) { PMD_DRV_LOG(ERR, "invalid ether_type(0x%04x) in" " ethertype filter.", efilter->ether_type); diff --git a/drivers/net/bonding/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c index a1c577b..712c3c4 100644 --- a/drivers/net/bonding/rte_eth_bond_alb.c +++ b/drivers/net/bonding/rte_eth_bond_alb.c @@ -233,7 +233,7 @@ void bond_mode_alb_arp_recv(struct rte_ether_hdr *eth_h, uint16_t offset, arp_h->arp_data.arp_tip = client_info->cli_ip; arp_h->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER); - arp_h->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + arp_h->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); arp_h->arp_hlen = RTE_ETHER_ADDR_LEN; arp_h->arp_plen = sizeof(uint32_t); arp_h->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY); diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 7087bc0..dbed185 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -607,7 +607,7 @@ struct client_stats_t { strlcpy(buf, info, 16); #endif - if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) { + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { ipv4_h = (struct rte_ipv4_hdr *)((char *)(eth_h + 1) + offset); ipv4_addr_to_dot(ipv4_h->src_addr, src_ip, MaxIPv4String); #ifdef RTE_LIBRTE_BOND_DEBUG_ALB @@ -653,7 +653,7 @@ struct client_stats_t { bond_mode_alb_arp_recv(eth_h, offset, internals); } #if defined(RTE_LIBRTE_BOND_DEBUG_ALB) || defined(RTE_LIBRTE_BOND_DEBUG_ALB_L1) - else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) + else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) mode6_debug("RX IPv4:", eth_h, bufs[i]->port, &burstnumberRX); #endif } @@ -811,7 +811,7 @@ struct client_stats_t { vlan_offset = get_vlan_offset(eth_hdr, &proto); - if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4) == proto) { + if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4) == proto) { struct rte_ipv4_hdr *ipv4_hdr = (struct rte_ipv4_hdr *) ((char *)(eth_hdr + 1) + vlan_offset); l3hash = ipv4_hash(ipv4_hdr); @@ -851,7 +851,7 @@ struct client_stats_t { l3hash = 0; l4hash = 0; - if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4) == proto) { + if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4) == proto) { struct rte_ipv4_hdr *ipv4_hdr = (struct rte_ipv4_hdr *) ((char *)(eth_hdr + 1) + vlan_offset); size_t ip_hdr_offset; diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c index 4f23468..07960fd 100644 --- a/drivers/net/cxgbe/cxgbe_flow.c +++ b/drivers/net/cxgbe/cxgbe_flow.c @@ -233,7 +233,7 @@ item, "ttl/tos are not supported"); fs->type = FILTER_TYPE_IPV4; - CXGBE_FILL_FS(RTE_ETHER_TYPE_IPv4, 0xffff, ethtype); + CXGBE_FILL_FS(RTE_ETHER_TYPE_IPV4, 0xffff, ethtype); if (!val) return 0; /* ipv4 wild card */ diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 828b3b5..441a3dd 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -222,7 +222,7 @@ static inline void dpaa_checksum(struct rte_mbuf *mbuf) struct rte_tcp_hdr *tcp_hdr = (struct rte_tcp_hdr *)(l3_hdr + mbuf->l3_len); tcp_hdr->cksum = 0; - if (eth_hdr->ether_type == htons(RTE_ETHER_TYPE_IPv4)) + if (eth_hdr->ether_type == htons(RTE_ETHER_TYPE_IPV4)) tcp_hdr->cksum = rte_ipv4_udptcp_cksum(ipv4_hdr, tcp_hdr); else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ @@ -233,7 +233,7 @@ static inline void dpaa_checksum(struct rte_mbuf *mbuf) struct rte_udp_hdr *udp_hdr = (struct rte_udp_hdr *)(l3_hdr + mbuf->l3_len); udp_hdr->dgram_cksum = 0; - if (eth_hdr->ether_type == htons(RTE_ETHER_TYPE_IPv4)) + if (eth_hdr->ether_type == htons(RTE_ETHER_TYPE_IPV4)) udp_hdr->dgram_cksum = rte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr); else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index bd1c64c..064d676 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -4746,7 +4746,7 @@ static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on) uint32_t etqf = 0; int ret; - if (filter->ether_type == RTE_ETHER_TYPE_IPv4 || + if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type == RTE_ETHER_TYPE_IPv6) { PMD_DRV_LOG(ERR, "unsupported ether_type(0x%04x) in" " ethertype filter.", filter->ether_type); diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c index 3429861..c34e25d 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c @@ -700,7 +700,7 @@ } } - if (filter->ether_type == RTE_ETHER_TYPE_IPv4 || + if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type == RTE_ETHER_TYPE_IPv6) { memset(filter, 0, sizeof(struct rte_eth_ethertype_filter)); rte_flow_error_set(error, EINVAL, diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c index d188e58..7b015ee 100644 --- a/drivers/net/enic/enic_flow.c +++ b/drivers/net/enic/enic_flow.c @@ -609,7 +609,7 @@ struct enic_action_cap { arg->l3_proto_off = *off + offsetof(struct rte_ipv4_hdr, next_proto_id); return copy_inner_common(&arg->filter->u.generic_1, off, arg->item->spec, mask, sizeof(struct rte_ipv4_hdr), - arg->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4), 2); + arg->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4), 2); } static int diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index f4d778e..162858a 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -9997,7 +9997,7 @@ struct i40e_ethertype_filter * PMD_DRV_LOG(ERR, "Invalid queue ID"); return -EINVAL; } - if (filter->ether_type == RTE_ETHER_TYPE_IPv4 || + if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type == RTE_ETHER_TYPE_IPv6) { PMD_DRV_LOG(ERR, "unsupported ether_type(0x%04x) in control packet filter.", diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index 3044e9d..f809f92 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -725,7 +725,7 @@ static int i40e_sw_fdir_filter_insert(struct i40e_pf *pf, case RTE_ETH_FLOW_FRAG_IPV4: ip = (struct rte_ipv4_hdr *)raw_pkt; - *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); ip->version_ihl = I40E_FDIR_IP_DEFAULT_VERSION_IHL; /* set len to by default */ ip->total_length = rte_cpu_to_be_16(I40E_FDIR_IP_DEFAULT_LEN); @@ -1009,7 +1009,7 @@ static int i40e_sw_fdir_filter_insert(struct i40e_pf *pf, is_customized_pctype) { ip = (struct rte_ipv4_hdr *)raw_pkt; - *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); ip->version_ihl = I40E_FDIR_IP_DEFAULT_VERSION_IHL; /* set len to by default */ ip->total_length = rte_cpu_to_be_16(I40E_FDIR_IP_DEFAULT_LEN); diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 8b2e297..f8ab046 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -2035,7 +2035,7 @@ static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf, } filter->ether_type = rte_be_to_cpu_16(eth_spec->type); - if (filter->ether_type == RTE_ETHER_TYPE_IPv4 || + if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type == RTE_ETHER_TYPE_IPv6 || filter->ether_type == RTE_ETHER_TYPE_LLDP || filter->ether_type == outer_tpid) { @@ -2507,7 +2507,7 @@ static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf, ether_type = rte_be_to_cpu_16(eth_spec->type); if (next == RTE_FLOW_ITEM_TYPE_VLAN || - ether_type == RTE_ETHER_TYPE_IPv4 || + ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPv6 || ether_type == RTE_ETHER_TYPE_ARP || ether_type == outer_tpid) { @@ -2552,7 +2552,7 @@ static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf, ether_type = rte_be_to_cpu_16(vlan_spec->inner_type); - if (ether_type == RTE_ETHER_TYPE_IPv4 || + if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPv6 || ether_type == RTE_ETHER_TYPE_ARP || ether_type == outer_tpid) { diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index fae93bb..b46d39a 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -6667,7 +6667,7 @@ static void ixgbevf_set_vfta_all(struct rte_eth_dev *dev, bool on) if (filter->queue >= IXGBE_MAX_RX_QUEUE_NUM) return -EINVAL; - if (filter->ether_type == RTE_ETHER_TYPE_IPv4 || + if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type == RTE_ETHER_TYPE_IPv6) { PMD_DRV_LOG(ERR, "unsupported ether_type(0x%04x) in" " ethertype filter.", filter->ether_type); diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index 23aba0a..def6283 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -887,7 +887,7 @@ const struct rte_flow_action *next_no_void_action( return -rte_errno; } - if (filter->ether_type == RTE_ETHER_TYPE_IPv4 || + if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type == RTE_ETHER_TYPE_IPv6) { memset(filter, 0, sizeof(struct rte_eth_ethertype_filter)); rte_flow_error_set(error, EINVAL, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index d096b02..ffa2696 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1258,9 +1258,9 @@ struct field_modify_info modify_tcp[] = { "neither eth nor vlan" " header found"); if (vlan && !vlan->eth_proto) - vlan->eth_proto = RTE_BE16(RTE_ETHER_TYPE_IPv4); + vlan->eth_proto = RTE_BE16(RTE_ETHER_TYPE_IPV4); else if (eth && !eth->ether_type) - eth->ether_type = RTE_BE16(RTE_ETHER_TYPE_IPv4); + eth->ether_type = RTE_BE16(RTE_ETHER_TYPE_IPV4); if (!ipv4->version_ihl) ipv4->version_ihl = MLX5_ENCAP_IPV4_VERSION | MLX5_ENCAP_IPV4_IHL_MIN; diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c index 7bdc302..d01d675 100644 --- a/drivers/net/qede/qede_filter.c +++ b/drivers/net/qede/qede_filter.c @@ -221,7 +221,7 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev) case RTE_ETH_FLOW_NONFRAG_IPV4_TCP: case RTE_ETH_FLOW_NONFRAG_IPV4_UDP: /* fill the common ip header */ - arfs->tuple.eth_proto = RTE_ETHER_TYPE_IPv4; + arfs->tuple.eth_proto = RTE_ETHER_TYPE_IPV4; arfs->tuple.dst_ipv4 = input->flow.ip4_flow.dst_ip; arfs->tuple.src_ipv4 = input->flow.ip4_flow.src_ip; arfs->tuple.ip_proto = next_proto[input->flow_type]; @@ -473,7 +473,7 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev) *ether_type = rte_cpu_to_be_16(arfs->tuple.eth_proto); switch (arfs->tuple.eth_proto) { - case RTE_ETHER_TYPE_IPv4: + case RTE_ETHER_TYPE_IPV4: ip = (struct rte_ipv4_hdr *)raw_pkt; ip->version_ihl = QEDE_FDIR_IP_DEFAULT_VERSION_IHL; ip->total_length = sizeof(struct rte_ipv4_hdr); @@ -1267,7 +1267,7 @@ static void qede_get_ecore_tunn_params(uint32_t filter, uint32_t *type, flow->entry.tuple.src_ipv4 = spec->hdr.src_addr; flow->entry.tuple.dst_ipv4 = spec->hdr.dst_addr; flow->entry.tuple.eth_proto = - RTE_ETHER_TYPE_IPv4; + RTE_ETHER_TYPE_IPV4; } break; diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index bb5f57d..a59e224 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -970,7 +970,7 @@ static inline uint32_t qede_rx_cqe_to_pkt_type_outer(struct rte_mbuf *m) ethertype = rte_cpu_to_be_16(vlan_hdr->eth_proto); } - if (ethertype == RTE_ETHER_TYPE_IPv4) { + if (ethertype == RTE_ETHER_TYPE_IPV4) { packet_type |= RTE_PTYPE_L3_IPV4; ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, len); diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 896aae5..f535a3a 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -565,7 +565,7 @@ struct ipc_queues { char *buff_data = rte_pktmbuf_mtod(seg, void *); proto = (*buff_data & 0xf0); pi.proto = (proto == 0x40) ? - rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4) : + rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4) : ((proto == 0x60) ? rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6) : 0x00); diff --git a/examples/bond/main.c b/examples/bond/main.c index 9b9ed56..2e95ce4 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -404,7 +404,7 @@ static int lcore_main(__attribute__((unused)) void *arg1) rte_eth_tx_burst(BOND_PORT, 0, NULL, 0); } } - } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) { + } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { if (rte_spinlock_trylock(&global_flag_stru_p->lock) == 1) { global_flag_stru_p->port_packets[2]++; rte_spinlock_unlock(&global_flag_stru_p->lock); @@ -485,7 +485,7 @@ static void cmd_obj_send_parsed(void *parsed_result, arp_hdr = (struct rte_arp_hdr *)( (char *)eth_hdr + sizeof(struct rte_ether_hdr)); arp_hdr->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER); - arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); arp_hdr->arp_hlen = RTE_ETHER_ADDR_LEN; arp_hdr->arp_plen = sizeof(uint32_t); arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REQUEST); diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index 4f94129..01c30ee 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -362,7 +362,7 @@ struct rte_lpm6_config lpm6_config = { rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv6); else eth_hdr->ether_type = - rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv4); + rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); } len += len2; @@ -680,7 +680,7 @@ struct rte_lpm6_config lpm6_config = { eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); ether_type = eth_hdr->ether_type; - if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN; else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 6624b19..10a3af6 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -362,7 +362,7 @@ struct rte_lpm6_config lpm6_config = { dst_port = next_hop; } - eth_hdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv4); + eth_hdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { /* if packet is IPv6 */ struct ipv6_extension_fragment *frag_hdr; diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index fd81b6c..601d45d 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -236,7 +236,7 @@ struct lcore_conf { struct rte_ether_hdr *eth; eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) { + if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { nlp = (uint8_t *)rte_pktmbuf_adj(pkt, RTE_ETHER_HDR_LEN); nlp = RTE_PTR_ADD(nlp, offsetof(struct ip, ip_p)); if (*nlp == IPPROTO_ESP) @@ -343,7 +343,7 @@ struct lcore_conf { if ((pkt->ol_flags & PKT_TX_IP_CKSUM) == 0) ip->ip_sum = rte_ipv4_cksum((struct rte_ipv4_hdr *)ip); - ethhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + ethhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); } else { pkt->ol_flags |= qconf->outbound.ipv6_offloads; pkt->l3_len = sizeof(struct ip6_hdr); diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index e4410f5..72eaadc 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -280,7 +280,7 @@ struct mcast_group_params { rte_ether_addr_copy(dest_addr, ðdr->d_addr); rte_ether_addr_copy(&ports_eth_addr[port], ðdr->s_addr); - ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv4); + ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); /* Put new packet into the output queue */ len = qconf->tx_mbufs[port].len; diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index afc658e..e282cb7 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -396,7 +396,7 @@ struct l2fwd_crypto_statistics { eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (eth_hdr->ether_type != rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) + if (eth_hdr->ether_type != rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) return -1; ipdata_offset = sizeof(struct rte_ether_hdr); diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 641d402..1162f7e 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -624,7 +624,7 @@ static int is_done(void) eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); ether_type = eth_hdr->ether_type; - if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN; else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c index 6d3c6cd..f45a430 100644 --- a/examples/l3fwd/l3fwd_em.c +++ b/examples/l3fwd/l3fwd_em.c @@ -574,7 +574,7 @@ struct ipv6_l3fwd_em_route { eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); ether_type = eth_hdr->ether_type; l3 = (uint8_t *)eth_hdr + sizeof(struct rte_ether_hdr); - if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) { + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { ipv4_hdr = (struct rte_ipv4_hdr *)l3; hdr_len = (ipv4_hdr->version_ihl & RTE_IPV4_HDR_IHL_MASK) * RTE_IPV4_IHL_MULTIPLIER; diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index b5ffd6a..c6491f6 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -386,7 +386,7 @@ struct ipv6_l3fwd_lpm_route { eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); ether_type = eth_hdr->ether_type; - if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN; else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 19b826e..9d879b6 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -98,7 +98,7 @@ eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); ether_type = eth_hdr->ether_type; - if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN; else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; diff --git a/examples/tep_termination/vxlan.c b/examples/tep_termination/vxlan.c index 44a39a4..c14ee94 100644 --- a/examples/tep_termination/vxlan.c +++ b/examples/tep_termination/vxlan.c @@ -16,7 +16,7 @@ static uint16_t get_psd_sum(void *l3_hdr, uint16_t ethertype, uint64_t ol_flags) { - if (ethertype == RTE_ETHER_TYPE_IPv4) + if (ethertype == RTE_ETHER_TYPE_IPV4) return rte_ipv4_phdr_cksum(l3_hdr, ol_flags); else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ return rte_ipv6_phdr_cksum(l3_hdr, ol_flags); @@ -46,7 +46,7 @@ } switch (ethertype) { - case RTE_ETHER_TYPE_IPv4: + case RTE_ETHER_TYPE_IPV4: ipv4_hdr = (struct rte_ipv4_hdr *) ((char *)eth_hdr + info->outer_l2_len); info->outer_l3_len = sizeof(struct rte_ipv4_hdr); @@ -94,7 +94,7 @@ l3_hdr = (char *)eth_hdr + info->l2_len; - if (ethertype == RTE_ETHER_TYPE_IPv4) { + if (ethertype == RTE_ETHER_TYPE_IPV4) { ipv4_hdr = (struct rte_ipv4_hdr *)l3_hdr; ipv4_hdr->hdr_checksum = 0; ol_flags |= PKT_TX_IPV4; diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c index ce7c2e5..9a08800 100644 --- a/examples/tep_termination/vxlan_setup.c +++ b/examples/tep_termination/vxlan_setup.c @@ -313,7 +313,7 @@ &app_l2_hdr[portid].d_addr); rte_ether_addr_copy(&ports_eth_addr[0], &app_l2_hdr[portid].s_addr); - app_l2_hdr[portid].ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4); + app_l2_hdr[portid].ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); ip = &app_ip_hdr[portid]; ip->version_ihl = IP_VHL_DEF; diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c index 94e8547..f82be19 100644 --- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c @@ -622,7 +622,7 @@ static uint16_t rxa_gcd_u16(uint16_t a, uint16_t b) *ipv6_hdr = NULL; switch (eth_hdr->ether_type) { - case RTE_BE16(RTE_ETHER_TYPE_IPv4): + case RTE_BE16(RTE_ETHER_TYPE_IPV4): *ipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1); break; @@ -633,7 +633,7 @@ static uint16_t rxa_gcd_u16(uint16_t a, uint16_t b) case RTE_BE16(RTE_ETHER_TYPE_VLAN): vlan_hdr = (struct rte_vlan_hdr *)(eth_hdr + 1); switch (vlan_hdr->eth_proto) { - case RTE_BE16(RTE_ETHER_TYPE_IPv4): + case RTE_BE16(RTE_ETHER_TYPE_IPV4): *ipv4_hdr = (struct rte_ipv4_hdr *)(vlan_hdr + 1); break; case RTE_BE16(RTE_ETHER_TYPE_IPv6): diff --git a/lib/librte_net/rte_arp.c b/lib/librte_net/rte_arp.c index 35a743c..cfd6e03 100644 --- a/lib/librte_net/rte_arp.c +++ b/lib/librte_net/rte_arp.c @@ -37,7 +37,7 @@ struct rte_mbuf * __rte_experimental /* RARP header. */ rarp = (struct rte_arp_hdr *)(eth_hdr + 1); rarp->arp_hardware = htons(RTE_ARP_HRD_ETHER); - rarp->arp_protocol = htons(RTE_ETHER_TYPE_IPv4); + rarp->arp_protocol = htons(RTE_ETHER_TYPE_IPV4); rarp->arp_hlen = RTE_ETHER_ADDR_LEN; rarp->arp_plen = 4; rarp->arp_opcode = htons(RTE_ARP_OP_REVREQUEST); diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 3404bdd..4873af6 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -298,7 +298,7 @@ struct rte_vxlan_hdr { } __attribute__((__packed__)); /* Ethernet frame types */ -#define RTE_ETHER_TYPE_IPv4 0x0800 /**< IPv4 Protocol. */ +#define RTE_ETHER_TYPE_IPV4 0x0800 /**< IPv4 Protocol. */ #define RTE_ETHER_TYPE_IPv6 0x86DD /**< IPv6 Protocol. */ #define RTE_ETHER_TYPE_ARP 0x0806 /**< Arp Protocol. */ #define RTE_ETHER_TYPE_RARP 0x8035 /**< Reverse Arp Protocol. */ diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index e1868f7..0196d70 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.c @@ -161,7 +161,7 @@ return RTE_PTYPE_TUNNEL_GRE; } case IPPROTO_IPIP: - *proto = rte_cpu_to_be_16(RTE_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(RTE_ETHER_TYPE_IPv6); @@ -249,7 +249,7 @@ 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(RTE_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(RTE_ETHER_TYPE_VLAN)) { @@ -299,7 +299,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, if ((layers & RTE_PTYPE_L3_MASK) == 0) return pkt_type; - if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) { + if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { const struct rte_ipv4_hdr *ip4h; struct rte_ipv4_hdr ip4h_copy; @@ -431,7 +431,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, if ((layers & RTE_PTYPE_INNER_L3_MASK) == 0) return pkt_type; - if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) { + if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { const struct rte_ipv4_hdr *ip4h; struct rte_ipv4_hdr ip4h_copy; diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c index b3c8603..9002278 100644 --- a/lib/librte_pipeline/rte_table_action.c +++ b/lib/librte_pipeline/rte_table_action.c @@ -611,7 +611,7 @@ struct encap_qinq_pppoe_data { { struct encap_ether_data *d = data; uint16_t ethertype = (common_cfg->ip_version) ? - RTE_ETHER_TYPE_IPv4 : + RTE_ETHER_TYPE_IPV4 : RTE_ETHER_TYPE_IPv6; /* Ethernet */ @@ -629,7 +629,7 @@ struct encap_qinq_pppoe_data { { struct encap_vlan_data *d = data; uint16_t ethertype = (common_cfg->ip_version) ? - RTE_ETHER_TYPE_IPv4 : + RTE_ETHER_TYPE_IPV4 : RTE_ETHER_TYPE_IPv6; /* Ethernet */ @@ -653,7 +653,7 @@ struct encap_qinq_pppoe_data { { struct encap_qinq_data *d = data; uint16_t ethertype = (common_cfg->ip_version) ? - RTE_ETHER_TYPE_IPv4 : + RTE_ETHER_TYPE_IPV4 : RTE_ETHER_TYPE_IPv6; /* Ethernet */ @@ -786,7 +786,7 @@ struct encap_qinq_pppoe_data { d->vlan.vlan_tci = rte_htons(VLAN(p->vxlan.vlan.pcp, p->vxlan.vlan.dei, p->vxlan.vlan.vid)); - d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IPv4); + d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IPV4); /* IPv4*/ d->ipv4.version_ihl = 0x45; @@ -821,7 +821,7 @@ struct encap_qinq_pppoe_data { &d->ether.d_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, &d->ether.s_addr); - d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPv4); + d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV4); /* IPv4*/ d->ipv4.version_ihl = 0x45; diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index fe99116..a608a0d 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -988,7 +988,7 @@ l3_hdr = (char *)eth_hdr + m->l2_len; switch (ethertype) { - case RTE_ETHER_TYPE_IPv4: + case RTE_ETHER_TYPE_IPV4: ipv4_hdr = l3_hdr; *l4_proto = ipv4_hdr->next_proto_id; m->l3_len = (ipv4_hdr->version_ihl & 0x0f) * 4; -- 1.8.3.1