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 6F3DFA0465 for ; Wed, 29 May 2019 13:30:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 039781B9B0; Wed, 29 May 2019 13:30:28 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 27D9B1B9AF for ; Wed, 29 May 2019 13:30:27 +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 047A030ADC93; Wed, 29 May 2019 11:30:21 +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 E3515277B8; Wed, 29 May 2019 11:30:09 +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 , 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 , Marko Kovacevic , Ori Kam , Bruce Richardson , Pablo de Lara , Radu Nicolau , Akhil Goyal , Tomasz Kantecki , David Hunt , John McNamara , Harry van Haaren , Xiaoyun Li , Tiwei Bie , Zhihong Wang , Nikhil Rao , Jerin Jacob , Cristian Dumitrescu Date: Wed, 29 May 2019 13:29:18 +0200 Message-Id: <1559129358-2935-5-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.47]); Wed, 29 May 2019 11:30:21 +0000 (UTC) Subject: [dpdk-dev] [PATCH 5/5] replace RTE_ETHER_TYPE_IPv6 with uppercase RTE_ETHER_TYPE_IPV6 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_IPv6 new=RTE_ETHER_TYPE_IPV6 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 | 14 +++++++------- app/test/packet_burst_generator.c | 4 ++-- app/test/test_link_bonding.c | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- 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/ip_fragmentation/main.c | 4 ++-- examples/ip_reassembly/main.c | 2 +- examples/ipsec-secgw/ipsec-secgw.c | 4 ++-- 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/vhost/main.c | 2 +- lib/librte_eventdev/rte_event_eth_rx_adapter.c | 4 ++-- lib/librte_net/rte_ether.h | 2 +- lib/librte_net/rte_net.c | 6 +++--- lib/librte_pipeline/rte_table_action.c | 10 +++++----- lib/librte_vhost/virtio_net.c | 2 +- 34 files changed, 69 insertions(+), 69 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index a0fa748..201bd9d 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -3684,7 +3684,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, else if (l2_encap_conf.select_ipv4) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(eth.dst.addr_bytes, l2_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, @@ -3695,7 +3695,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (l2_encap_conf.select_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); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(header, &vlan, sizeof(vlan)); header += sizeof(vlan); } @@ -3819,7 +3819,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, else if (mplsogre_encap_conf.select_ipv4) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(eth.dst.addr_bytes, mplsogre_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, @@ -3830,7 +3830,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsogre_encap_conf.select_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); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(header, &vlan, sizeof(vlan)); header += sizeof(vlan); } @@ -3914,7 +3914,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, else if (mplsogre_encap_conf.select_ipv4) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(eth.dst.addr_bytes, mplsogre_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, @@ -3925,7 +3925,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsogre_encap_conf.select_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); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(header, &vlan, sizeof(vlan)); header += sizeof(vlan); } @@ -4010,7 +4010,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, else if (mplsoudp_encap_conf.select_ipv4) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(eth.dst.addr_bytes, mplsoudp_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, @@ -4021,7 +4021,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsoudp_encap_conf.select_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); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(header, &vlan, sizeof(vlan)); header += sizeof(vlan); } @@ -4107,7 +4107,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, else if (mplsoudp_encap_conf.select_ipv4) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else - eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(eth.dst.addr_bytes, mplsoudp_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, @@ -4118,7 +4118,7 @@ static int comp_vc_action_rss_queue(struct context *, const struct token *, if (mplsoudp_encap_conf.select_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); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); memcpy(header, &vlan, sizeof(vlan)); header += sizeof(vlan); } diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 3732fd1..e1cb7fb 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -94,7 +94,7 @@ struct simple_gre_hdr { { if (ethertype == _htons(RTE_ETHER_TYPE_IPV4)) return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr); - else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ + else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr); } @@ -166,7 +166,7 @@ struct simple_gre_hdr { ((char *)eth_hdr + info->l2_len); parse_ipv4(ipv4_hdr, info); break; - case _htons(RTE_ETHER_TYPE_IPv6): + case _htons(RTE_ETHER_TYPE_IPV6): ipv6_hdr = (struct rte_ipv6_hdr *) ((char *)eth_hdr + info->l2_len); parse_ipv6(ipv6_hdr, info); @@ -251,7 +251,7 @@ struct simple_gre_hdr { ipv6_hdr = (struct rte_ipv6_hdr *)((char *)vxlan_gpe_hdr + vxlan_gpe_len); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv6); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV6); parse_ipv6(ipv6_hdr, info); info->l2_len = 0; @@ -303,7 +303,7 @@ struct simple_gre_hdr { info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); info->l2_len = 0; - } else if (gre_hdr->proto == _htons(RTE_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; @@ -312,7 +312,7 @@ struct simple_gre_hdr { ipv6_hdr = (struct rte_ipv6_hdr *)((char *)gre_hdr + gre_len); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv6); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV6); parse_ipv6(ipv6_hdr, info); info->l2_len = 0; @@ -356,7 +356,7 @@ struct simple_gre_hdr { info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); } else { parse_ipv6(ipv6_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv6); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV6); } info->l2_len = 0; } @@ -402,7 +402,7 @@ struct simple_gre_hdr { ipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr); } - } else if (info->ethertype == _htons(RTE_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 */ diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c index cf22d18..9776d58 100644 --- a/app/test/packet_burst_generator.c +++ b/app/test/packet_burst_generator.c @@ -327,7 +327,7 @@ pkt->vlan_tci = RTE_ETHER_TYPE_IPV4; pkt->l3_len = sizeof(struct rte_ipv4_hdr); } else { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv6; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV6; pkt->l3_len = sizeof(struct rte_ipv6_hdr); } @@ -448,7 +448,7 @@ pkt->vlan_tci = RTE_ETHER_TYPE_IPV4; pkt->l3_len = sizeof(struct rte_ipv4_hdr); } else { - pkt->vlan_tci = RTE_ETHER_TYPE_IPv6; + pkt->vlan_tci = RTE_ETHER_TYPE_IPV6; pkt->l3_len = sizeof(struct rte_ipv6_hdr); } diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c index a180899..938fafc 100644 --- a/app/test/test_link_bonding.c +++ b/app/test/test_link_bonding.c @@ -1274,7 +1274,7 @@ struct link_bonding_unittest_params { if (ipv4) ether_type = RTE_ETHER_TYPE_IPV4; else - ether_type = RTE_ETHER_TYPE_IPv6; + ether_type = RTE_ETHER_TYPE_IPV6; if (toggle_dst_mac) initialize_eth_header(test_params->pkt_eth_hdr, diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 42738b8..6d2a672 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1797,7 +1797,7 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu) *ret = 0; if (efilter->ether_type == RTE_ETHER_TYPE_IPV4 || - efilter->ether_type == RTE_ETHER_TYPE_IPv6) { + efilter->ether_type == RTE_ETHER_TYPE_IPV6) { PMD_DRV_LOG(ERR, "invalid ether_type(0x%04x) in" " ethertype filter.", efilter->ether_type); *ret = -EINVAL; diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index dbed185..ca34945 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -816,7 +816,7 @@ struct client_stats_t { ((char *)(eth_hdr + 1) + vlan_offset); l3hash = ipv4_hash(ipv4_hdr); - } else if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6) == proto) { + } else if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6) == proto) { struct rte_ipv6_hdr *ipv6_hdr = (struct rte_ipv6_hdr *) ((char *)(eth_hdr + 1) + vlan_offset); l3hash = ipv6_hash(ipv6_hdr); @@ -882,7 +882,7 @@ struct client_stats_t { l4hash = HASH_L4_PORTS(udp_hdr); } } - } else if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6) == proto) { + } else if (rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6) == proto) { struct rte_ipv6_hdr *ipv6_hdr = (struct rte_ipv6_hdr *) ((char *)(eth_hdr + 1) + vlan_offset); l3hash = ipv6_hash(ipv6_hdr); diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c index 07960fd..d3de689 100644 --- a/drivers/net/cxgbe/cxgbe_flow.c +++ b/drivers/net/cxgbe/cxgbe_flow.c @@ -262,7 +262,7 @@ "tc/flow/hop are not supported"); fs->type = FILTER_TYPE_IPV6; - CXGBE_FILL_FS(RTE_ETHER_TYPE_IPv6, 0xffff, ethtype); + CXGBE_FILL_FS(RTE_ETHER_TYPE_IPV6, 0xffff, ethtype); if (!val) return 0; /* ipv6 wild card */ diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 441a3dd..f16b7e0 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -225,7 +225,7 @@ static inline void dpaa_checksum(struct rte_mbuf *mbuf) 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 */ + else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ tcp_hdr->cksum = rte_ipv6_udptcp_cksum(ipv6_hdr, tcp_hdr); } else if ((mbuf->packet_type & RTE_PTYPE_L4_MASK) == @@ -236,7 +236,7 @@ static inline void dpaa_checksum(struct rte_mbuf *mbuf) 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 */ + else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ udp_hdr->dgram_cksum = rte_ipv6_udptcp_cksum(ipv6_hdr, udp_hdr); } diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 064d676..29c5500 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -4747,7 +4747,7 @@ static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on) int ret; if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || - filter->ether_type == RTE_ETHER_TYPE_IPv6) { + filter->ether_type == RTE_ETHER_TYPE_IPV6) { PMD_DRV_LOG(ERR, "unsupported ether_type(0x%04x) in" " ethertype filter.", filter->ether_type); return -EINVAL; diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c index c34e25d..9f002de 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c @@ -701,7 +701,7 @@ } if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || - filter->ether_type == RTE_ETHER_TYPE_IPv6) { + filter->ether_type == RTE_ETHER_TYPE_IPV6) { memset(filter, 0, sizeof(struct rte_eth_ethertype_filter)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c index 7b015ee..cbc212e 100644 --- a/drivers/net/enic/enic_flow.c +++ b/drivers/net/enic/enic_flow.c @@ -625,7 +625,7 @@ struct enic_action_cap { arg->l3_proto_off = *off + offsetof(struct rte_ipv6_hdr, proto); return copy_inner_common(&arg->filter->u.generic_1, off, arg->item->spec, mask, sizeof(struct rte_ipv6_hdr), - arg->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6), 2); + arg->l2_proto_off, rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6), 2); } static int diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 162858a..7fa9e1b 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -9998,7 +9998,7 @@ struct i40e_ethertype_filter * return -EINVAL; } if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || - filter->ether_type == RTE_ETHER_TYPE_IPv6) { + filter->ether_type == RTE_ETHER_TYPE_IPV6) { PMD_DRV_LOG(ERR, "unsupported ether_type(0x%04x) in control packet filter.", filter->ether_type); diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index f809f92..b3e893a 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -752,7 +752,7 @@ static int i40e_sw_fdir_filter_insert(struct i40e_pf *pf, case RTE_ETH_FLOW_FRAG_IPV6: ip6 = (struct rte_ipv6_hdr *)raw_pkt; - *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); ip6->vtc_flow = rte_cpu_to_be_32(I40E_FDIR_IPv6_DEFAULT_VTC_FLOW | (fdir_input->flow.ipv6_flow.tc << @@ -1042,7 +1042,7 @@ static int i40e_sw_fdir_filter_insert(struct i40e_pf *pf, pctype == I40E_FILTER_PCTYPE_FRAG_IPV6) { ip6 = (struct rte_ipv6_hdr *)raw_pkt; - *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); ip6->vtc_flow = rte_cpu_to_be_32(I40E_FDIR_IPv6_DEFAULT_VTC_FLOW | (fdir_input->flow.ipv6_flow.tc << diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index f8ab046..9bfbea2 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -2036,7 +2036,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 || - filter->ether_type == RTE_ETHER_TYPE_IPv6 || + filter->ether_type == RTE_ETHER_TYPE_IPV6 || filter->ether_type == RTE_ETHER_TYPE_LLDP || filter->ether_type == outer_tpid) { rte_flow_error_set(error, EINVAL, @@ -2508,7 +2508,7 @@ static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf, if (next == RTE_FLOW_ITEM_TYPE_VLAN || ether_type == RTE_ETHER_TYPE_IPV4 || - ether_type == RTE_ETHER_TYPE_IPv6 || + ether_type == RTE_ETHER_TYPE_IPV6 || ether_type == RTE_ETHER_TYPE_ARP || ether_type == outer_tpid) { rte_flow_error_set(error, EINVAL, @@ -2553,7 +2553,7 @@ static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf, rte_be_to_cpu_16(vlan_spec->inner_type); if (ether_type == RTE_ETHER_TYPE_IPV4 || - ether_type == RTE_ETHER_TYPE_IPv6 || + ether_type == RTE_ETHER_TYPE_IPV6 || ether_type == RTE_ETHER_TYPE_ARP || ether_type == outer_tpid) { rte_flow_error_set(error, EINVAL, diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index b46d39a..3636b50 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -6668,7 +6668,7 @@ static void ixgbevf_set_vfta_all(struct rte_eth_dev *dev, bool on) return -EINVAL; if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || - filter->ether_type == RTE_ETHER_TYPE_IPv6) { + filter->ether_type == RTE_ETHER_TYPE_IPV6) { PMD_DRV_LOG(ERR, "unsupported ether_type(0x%04x) in" " ethertype filter.", filter->ether_type); return -EINVAL; diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index def6283..2b8529f 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -888,7 +888,7 @@ const struct rte_flow_action *next_no_void_action( } if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || - filter->ether_type == RTE_ETHER_TYPE_IPv6) { + filter->ether_type == RTE_ETHER_TYPE_IPV6) { memset(filter, 0, sizeof(struct rte_eth_ethertype_filter)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index ffa2696..933ad0b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1276,9 +1276,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_IPv6); + vlan->eth_proto = RTE_BE16(RTE_ETHER_TYPE_IPV6); else if (eth && !eth->ether_type) - eth->ether_type = RTE_BE16(RTE_ETHER_TYPE_IPv6); + eth->ether_type = RTE_BE16(RTE_ETHER_TYPE_IPV6); if (!ipv6->vtc_flow) ipv6->vtc_flow = RTE_BE32(MLX5_ENCAP_IPV6_VTC_FLOW); diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c index d01d675..a958e8a 100644 --- a/drivers/net/qede/qede_filter.c +++ b/drivers/net/qede/qede_filter.c @@ -237,7 +237,7 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev) break; case RTE_ETH_FLOW_NONFRAG_IPV6_TCP: case RTE_ETH_FLOW_NONFRAG_IPV6_UDP: - arfs->tuple.eth_proto = RTE_ETHER_TYPE_IPv6; + arfs->tuple.eth_proto = RTE_ETHER_TYPE_IPV6; arfs->tuple.ip_proto = next_proto[input->flow_type]; rte_memcpy(arfs->tuple.dst_ipv6, &input->flow.ipv6_flow.dst_ip, @@ -506,7 +506,7 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev) params->tcp = true; } break; - case RTE_ETHER_TYPE_IPv6: + case RTE_ETHER_TYPE_IPV6: ip6 = (struct rte_ipv6_hdr *)raw_pkt; ip6->proto = arfs->tuple.ip_proto; ip6->vtc_flow = @@ -1285,7 +1285,7 @@ static void qede_get_ecore_tunn_params(uint32_t filter, uint32_t *type, spec->hdr.dst_addr, IPV6_ADDR_LEN); flow->entry.tuple.eth_proto = - RTE_ETHER_TYPE_IPv6; + RTE_ETHER_TYPE_IPV6; } break; diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index a59e224..bae26ce 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -978,7 +978,7 @@ static inline uint32_t qede_rx_cqe_to_pkt_type_outer(struct rte_mbuf *m) packet_type |= RTE_PTYPE_L4_TCP; else if (ipv4_hdr->next_proto_id == IPPROTO_UDP) packet_type |= RTE_PTYPE_L4_UDP; - } else if (ethertype == RTE_ETHER_TYPE_IPv6) { + } else if (ethertype == RTE_ETHER_TYPE_IPV6) { packet_type |= RTE_PTYPE_L3_IPV6; ipv6_hdr = rte_pktmbuf_mtod_offset(m, struct rte_ipv6_hdr *, len); diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index f535a3a..074b3e8 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -567,7 +567,7 @@ struct ipc_queues { pi.proto = (proto == 0x40) ? rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4) : ((proto == 0x60) ? - rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6) : + rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6) : 0x00); } diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index 01c30ee..a5101fa 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -359,7 +359,7 @@ struct rte_lpm6_config lpm6_config = { ð_hdr->s_addr); if (ipv6) eth_hdr->ether_type = - rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv6); + rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6); else eth_hdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); @@ -682,7 +682,7 @@ struct rte_lpm6_config lpm6_config = { ether_type = eth_hdr->ether_type; 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)) + else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; m->packet_type = packet_type; diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 10a3af6..fbd0934 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -401,7 +401,7 @@ struct rte_lpm6_config lpm6_config = { dst_port = next_hop; } - eth_hdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv6); + eth_hdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6); } /* if packet wasn't IPv4 or IPv6, it's forwarded to the port it came from */ diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index 601d45d..6c626fa 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -247,7 +247,7 @@ struct lcore_conf { } pkt->l2_len = 0; pkt->l3_len = sizeof(struct ip); - } else if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) { + } else if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) { nlp = (uint8_t *)rte_pktmbuf_adj(pkt, RTE_ETHER_HDR_LEN); nlp = RTE_PTR_ADD(nlp, offsetof(struct ip6_hdr, ip6_nxt)); if (*nlp == IPPROTO_ESP) @@ -349,7 +349,7 @@ struct lcore_conf { pkt->l3_len = sizeof(struct ip6_hdr); pkt->l2_len = RTE_ETHER_HDR_LEN; - ethhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6); + ethhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); } memcpy(ðhdr->s_addr, ðaddr_tbl[port].src, diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 1162f7e..66ad105 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -626,7 +626,7 @@ static int is_done(void) ether_type = eth_hdr->ether_type; 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)) + else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; m->packet_type = packet_type; diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c index f45a430..5f499e0 100644 --- a/examples/l3fwd/l3fwd_em.c +++ b/examples/l3fwd/l3fwd_em.c @@ -586,7 +586,7 @@ struct ipv6_l3fwd_em_route { packet_type |= RTE_PTYPE_L4_UDP; } else packet_type |= RTE_PTYPE_L3_IPV4_EXT; - } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) { + } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) { ipv6_hdr = (struct rte_ipv6_hdr *)l3; if (ipv6_hdr->proto == IPPROTO_TCP) packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP; diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index c6491f6..4143683 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -388,7 +388,7 @@ struct ipv6_l3fwd_lpm_route { ether_type = eth_hdr->ether_type; 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)) + else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; m->packet_type = packet_type; diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 9d879b6..dd46895 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -100,7 +100,7 @@ ether_type = eth_hdr->ether_type; 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)) + else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; m->packet_type = packet_type; diff --git a/examples/tep_termination/vxlan.c b/examples/tep_termination/vxlan.c index c14ee94..52c35a7 100644 --- a/examples/tep_termination/vxlan.c +++ b/examples/tep_termination/vxlan.c @@ -18,7 +18,7 @@ { if (ethertype == RTE_ETHER_TYPE_IPV4) return rte_ipv4_phdr_cksum(l3_hdr, ol_flags); - else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ + else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ return rte_ipv6_phdr_cksum(l3_hdr, ol_flags); } @@ -52,7 +52,7 @@ info->outer_l3_len = sizeof(struct rte_ipv4_hdr); *l4_proto = ipv4_hdr->next_proto_id; break; - case RTE_ETHER_TYPE_IPv6: + case RTE_ETHER_TYPE_IPV6: ipv6_hdr = (struct rte_ipv6_hdr *) ((char *)eth_hdr + info->outer_l2_len); info->outer_l3_len = sizeof(struct rte_ipv6_hdr); @@ -101,7 +101,7 @@ ol_flags |= PKT_TX_IP_CKSUM; info->l3_len = sizeof(struct rte_ipv4_hdr); l4_proto = ipv4_hdr->next_proto_id; - } else if (ethertype == RTE_ETHER_TYPE_IPv6) { + } else if (ethertype == RTE_ETHER_TYPE_IPV6) { ipv6_hdr = (struct rte_ipv6_hdr *)l3_hdr; info->l3_len = sizeof(struct rte_ipv6_hdr); l4_proto = ipv6_hdr->proto; diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 9427d59..0961db0 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -858,7 +858,7 @@ static unsigned check_ports_num(unsigned nb_ports) { if (ol_flags & PKT_TX_IPV4) return rte_ipv4_phdr_cksum(l3_hdr, ol_flags); - else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ + else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ return rte_ipv6_phdr_cksum(l3_hdr, ol_flags); } diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c index f82be19..a97d198 100644 --- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c @@ -626,7 +626,7 @@ static uint16_t rxa_gcd_u16(uint16_t a, uint16_t b) *ipv4_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1); break; - case RTE_BE16(RTE_ETHER_TYPE_IPv6): + case RTE_BE16(RTE_ETHER_TYPE_IPV6): *ipv6_hdr = (struct rte_ipv6_hdr *)(eth_hdr + 1); break; @@ -636,7 +636,7 @@ static uint16_t rxa_gcd_u16(uint16_t a, uint16_t b) case RTE_BE16(RTE_ETHER_TYPE_IPV4): *ipv4_hdr = (struct rte_ipv4_hdr *)(vlan_hdr + 1); break; - case RTE_BE16(RTE_ETHER_TYPE_IPv6): + case RTE_BE16(RTE_ETHER_TYPE_IPV6): *ipv6_hdr = (struct rte_ipv6_hdr *)(vlan_hdr + 1); break; default: diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 4873af6..7be9b48 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -299,7 +299,7 @@ struct rte_vxlan_hdr { /* Ethernet frame types */ #define RTE_ETHER_TYPE_IPV4 0x0800 /**< IPv4 Protocol. */ -#define RTE_ETHER_TYPE_IPv6 0x86DD /**< IPv6 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. */ #define RTE_ETHER_TYPE_VLAN 0x8100 /**< IEEE 802.1Q VLAN tagging. */ diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index 0196d70..6515909 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.c @@ -164,7 +164,7 @@ *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); + *proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); return RTE_PTYPE_TUNNEL_IP; /* IP is also valid for IPv6 */ default: return 0; @@ -322,7 +322,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, } proto = ip4h->next_proto_id; pkt_type |= ptype_l4(proto); - } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) { + } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) { const struct rte_ipv6_hdr *ip6h; struct rte_ipv6_hdr ip6h_copy; int frag = 0; @@ -454,7 +454,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, } proto = ip4h->next_proto_id; pkt_type |= ptype_inner_l4(proto); - } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv6)) { + } else if (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) { const struct rte_ipv6_hdr *ip6h; struct rte_ipv6_hdr ip6h_copy; int frag = 0; diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c index 9002278..a54ec46 100644 --- a/lib/librte_pipeline/rte_table_action.c +++ b/lib/librte_pipeline/rte_table_action.c @@ -612,7 +612,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_IPv6; + RTE_ETHER_TYPE_IPV6; /* Ethernet */ rte_ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr); @@ -630,7 +630,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_IPv6; + RTE_ETHER_TYPE_IPV6; /* Ethernet */ rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr); @@ -654,7 +654,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_IPv6; + RTE_ETHER_TYPE_IPV6; /* Ethernet */ rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr); @@ -864,7 +864,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_IPv6); + d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IPV6); /* IPv6*/ d->ipv6.vtc_flow = rte_htonl((6 << 28) | @@ -899,7 +899,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_IPv6); + d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV6); /* IPv6*/ d->ipv6.vtc_flow = rte_htonl((6 << 28) | diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index a608a0d..bd6635c 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -995,7 +995,7 @@ *l4_hdr = (char *)l3_hdr + m->l3_len; m->ol_flags |= PKT_TX_IPV4; break; - case RTE_ETHER_TYPE_IPv6: + case RTE_ETHER_TYPE_IPV6: ipv6_hdr = l3_hdr; *l4_proto = ipv6_hdr->proto; m->l3_len = sizeof(struct rte_ipv6_hdr); -- 1.8.3.1