From 7e33267d41851d668f8c8555b857604ab69eaaa5 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 27 Oct 2014 16:11:04 +0100 Subject: [PATCH] fix VXLAN acronym Each letter must be uppercased: Virtual eXtensible Local Area Network (VXLAN) Signed-off-by: Thomas Monjalon --- app/test-pmd/cmdline.c | 6 +++--- app/test-pmd/rxonly.c | 2 +- lib/librte_ether/rte_ether.h | 2 +- lib/librte_mbuf/rte_mbuf.h | 2 +- lib/librte_pmd_i40e/i40e_ethdev.c | 6 +++--- lib/librte_pmd_i40e/i40e_ethdev.h | 2 +- lib/librte_pmd_i40e/i40e_rxtx.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 757c399817..47162e9082 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -294,10 +294,10 @@ static void cmd_help_long_parsed(void *parsed_result, " remove a tunnel filter of a port.\n\n" "rx_vxlan_port add (udp_port) (port_id)\n" - " Add an UDP port for VxLAN packet filter on a port\n\n" + " Add an UDP port for VXLAN packet filter on a port\n\n" "rx_vxlan_port rm (udp_port) (port_id)\n" - " Remove an UDP port for VxLAN packet filter on a port\n\n" + " Remove an UDP port for VXLAN packet filter on a port\n\n" "tx_vlan set vlan_id (port_id)\n" " Set hardware insertion of VLAN ID in packets sent" @@ -6303,7 +6303,7 @@ cmd_tunnel_filter_parsed(void *parsed_result, if (!strcmp(res->tunnel_type, "vxlan")) tunnel_filter_conf.tunnel_type = RTE_TUNNEL_TYPE_VXLAN; else { - printf("Only VxLAN is supported now.\n"); + printf("Only VXLAN is supported now.\n"); return; } diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c index a5a80a783a..4410c3d71d 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c @@ -210,7 +210,7 @@ pkt_burst_receive(struct fwd_stream *fs) unsigned char *) + l2_len + l3_len + l4_len); - printf(" - VxLAN packet: packet type =%d, " + printf(" - VXLAN packet: packet type =%d, " "Destination UDP port =%d, VNI = %d", packet_type, RTE_BE_TO_CPU_16(udp_hdr->dst_port), rte_be_to_cpu_32(vxlan_hdr->vx_vni) >> 8); diff --git a/lib/librte_ether/rte_ether.h b/lib/librte_ether/rte_ether.h index 100cc525c3..f173509ea3 100644 --- a/lib/librte_ether/rte_ether.h +++ b/lib/librte_ether/rte_ether.h @@ -305,7 +305,7 @@ struct vxlan_hdr { #define ETHER_TYPE_1588 0x88F7 /**< IEEE 802.1AS 1588 Precise Time Protocol. */ #define ETHER_VXLAN_HLEN (sizeof(struct udp_hdr) + sizeof(struct vxlan_hdr)) -/**< VxLAN tunnel header length. */ +/**< VXLAN tunnel header length. */ #ifdef __cplusplus } diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index a86dedf93a..e8f9bfcf45 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -96,7 +96,7 @@ extern "C" { #define PKT_TX_VLAN_PKT (1ULL << 55) /**< TX packet is a 802.1q VLAN packet. */ #define PKT_TX_IP_CKSUM (1ULL << 54) /**< IP cksum of TX pkt. computed by NIC. */ -#define PKT_TX_VXLAN_CKSUM (1ULL << 50) /**< TX checksum of VxLAN computed by NIC */ +#define PKT_TX_VXLAN_CKSUM (1ULL << 50) /**< TX checksum of VXLAN computed by NIC */ #define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ #define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ #define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/lib/librte_pmd_i40e/i40e_ethdev.c index 34981e4211..e1f581a8fa 100644 --- a/lib/librte_pmd_i40e/i40e_ethdev.c +++ b/lib/librte_pmd_i40e/i40e_ethdev.c @@ -4240,7 +4240,7 @@ i40e_add_vxlan_port(struct i40e_pf *pf, uint16_t port) ret = i40e_aq_add_udp_tunnel(hw, port, I40E_AQC_TUNNEL_TYPE_VXLAN, &filter_idx, NULL); if (ret < 0) { - PMD_DRV_LOG(ERR, "Failed to add VxLAN UDP port %d", port); + PMD_DRV_LOG(ERR, "Failed to add VXLAN UDP port %d", port); return -1; } @@ -4264,7 +4264,7 @@ i40e_del_vxlan_port(struct i40e_pf *pf, uint16_t port) struct i40e_hw *hw = I40E_PF_TO_HW(pf); if (!(pf->flags & I40E_FLAG_VXLAN)) { - PMD_DRV_LOG(ERR, "VxLAN UDP port was not configured."); + PMD_DRV_LOG(ERR, "VXLAN UDP port was not configured."); return -EINVAL; } @@ -4276,7 +4276,7 @@ i40e_del_vxlan_port(struct i40e_pf *pf, uint16_t port) } if (i40e_aq_del_udp_tunnel(hw, idx, NULL) < 0) { - PMD_DRV_LOG(ERR, "Failed to delete VxLAN UDP port %d", port); + PMD_DRV_LOG(ERR, "Failed to delete VXLAN UDP port %d", port); return -1; } diff --git a/lib/librte_pmd_i40e/i40e_ethdev.h b/lib/librte_pmd_i40e/i40e_ethdev.h index 826a1fb290..a315adf276 100644 --- a/lib/librte_pmd_i40e/i40e_ethdev.h +++ b/lib/librte_pmd_i40e/i40e_ethdev.h @@ -249,7 +249,7 @@ struct i40e_pf { uint16_t vf_nb_qps; /* The number of queue pairs of VF */ uint16_t fdir_nb_qps; /* The number of queue pairs of Flow Director */ - /* store VxLAN UDP ports */ + /* store VXLAN UDP ports */ uint16_t vxlan_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS]; uint16_t vxlan_bitmap; /* Vxlan bit mask */ }; diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c index 7599df9698..315a9c0a65 100644 --- a/lib/librte_pmd_i40e/i40e_rxtx.c +++ b/lib/librte_pmd_i40e/i40e_rxtx.c @@ -431,7 +431,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags, return; } - /* VxLAN packet TX checksum offload */ + /* VXLAN packet TX checksum offload */ if (unlikely(ol_flags & PKT_TX_VXLAN_CKSUM)) { uint8_t l4tun_len; -- 2.20.1