X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_link_bonding.c;h=938fafca3a95ac90bb74fb4b881682d790b70b7b;hb=8741a907453681b3c7f3ad8e2fb6de08b9fdf574;hp=eb6f1a9f1866b36b03cc0c887cf498cc7521f592;hpb=35b2d13fd6fdcbd191f2a30d74648faeb1186c65;p=dpdk.git

diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index eb6f1a9f18..938fafca3a 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -78,15 +78,15 @@ struct link_bonding_unittest_params {
 
 	/* Packet Headers */
 	struct rte_ether_hdr *pkt_eth_hdr;
-	struct ipv4_hdr *pkt_ipv4_hdr;
-	struct ipv6_hdr *pkt_ipv6_hdr;
-	struct udp_hdr *pkt_udp_hdr;
+	struct rte_ipv4_hdr *pkt_ipv4_hdr;
+	struct rte_ipv6_hdr *pkt_ipv6_hdr;
+	struct rte_udp_hdr *pkt_udp_hdr;
 
 };
 
-static struct ipv4_hdr pkt_ipv4_hdr;
-static struct ipv6_hdr pkt_ipv6_hdr;
-static struct udp_hdr pkt_udp_hdr;
+static struct rte_ipv4_hdr pkt_ipv4_hdr;
+static struct rte_ipv6_hdr pkt_ipv6_hdr;
+static struct rte_udp_hdr pkt_udp_hdr;
 
 static struct link_bonding_unittest_params default_params  = {
 	.bonded_port_id = -1,
@@ -1272,9 +1272,9 @@ generate_test_burst(struct rte_mbuf **pkts_burst, uint16_t burst_size,
 	void *ip_hdr;
 
 	if (ipv4)
-		ether_type = RTE_ETHER_TYPE_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,
@@ -2047,7 +2047,7 @@ test_activebackup_tx_burst(void)
 	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 @@ test_balance_l2_tx_burst(void)
 	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 @@ test_balance_l2_tx_burst(void)
 	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 @@ test_broadcast_tx_burst(void)
 	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 @@ test_tlb_tx_burst(void)
 			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);