X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cmdline_etheraddr.c;h=9691c32ba250c521eb24ccb5bd16f0b0cd077241;hb=ff6fcd415f4b2be7572abffa5284978c176d3de4;hp=90943c2b46e843f795b8060c2358c3f8e53cc4aa;hpb=6d13ea8e8e49ab957deae2bba5ecf4a4bfe747d1;p=dpdk.git

diff --git a/app/test/test_cmdline_etheraddr.c b/app/test/test_cmdline_etheraddr.c
index 90943c2b46..9691c32ba2 100644
--- a/app/test/test_cmdline_etheraddr.c
+++ b/app/test/test_cmdline_etheraddr.c
@@ -72,20 +72,11 @@ const char * ether_addr_invalid_strs[] = {
 		" ",
 };
 
-#define ETHERADDR_VALID_STRS_SIZE \
-	(sizeof(ether_addr_valid_strs) / sizeof(ether_addr_valid_strs[0]))
-#define ETHERADDR_GARBAGE_STRS_SIZE \
-	(sizeof(ether_addr_garbage_strs) / sizeof(ether_addr_garbage_strs[0]))
-#define ETHERADDR_INVALID_STRS_SIZE \
-	(sizeof(ether_addr_invalid_strs) / sizeof(ether_addr_invalid_strs[0]))
-
-
-
 static int
 is_addr_different(const struct rte_ether_addr addr, uint64_t num)
 {
 	int i;
-	for (i = 0; i < ETHER_ADDR_LEN; i++, num >>= 8)
+	for (i = 0; i < RTE_ETHER_ADDR_LEN; i++, num >>= 8)
 		if (addr.addr_bytes[i] != (num & 0xFF)) {
 			return 1;
 		}
@@ -151,7 +142,7 @@ test_parse_etheraddr_invalid_data(void)
 	struct rte_ether_addr result;
 
 	/* test full strings */
-	for (i = 0; i < ETHERADDR_INVALID_STRS_SIZE; i++) {
+	for (i = 0; i < RTE_DIM(ether_addr_invalid_strs); i++) {
 
 		memset(&result, 0, sizeof(struct rte_ether_addr));
 
@@ -176,7 +167,7 @@ test_parse_etheraddr_valid(void)
 	struct rte_ether_addr result;
 
 	/* test full strings */
-	for (i = 0; i < ETHERADDR_VALID_STRS_SIZE; i++) {
+	for (i = 0; i < RTE_DIM(ether_addr_valid_strs); i++) {
 
 		memset(&result, 0, sizeof(struct rte_ether_addr));
 
@@ -195,7 +186,7 @@ test_parse_etheraddr_valid(void)
 	}
 
 	/* test garbage strings */
-	for (i = 0; i < ETHERADDR_GARBAGE_STRS_SIZE; i++) {
+	for (i = 0; i < RTE_DIM(ether_addr_garbage_strs); i++) {
 
 		memset(&result, 0, sizeof(struct rte_ether_addr));