Skip to contentSkip to conversation

app/testpmd: fix str2flowtype not used warnings

PATCH Applied Viacheslav Ovsiienko 3 participants 3 messages Nov 24, 2020 – Nov 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 app/testpmd: fix str2flowtype not used warnings

If there was no RTE_NET_I40E configured the static routine str2flowtype() was not used causing compilation warning.

The str2flowtype() is moved under #ifdef RTE_NET_I40E block.

Fixes 1be514fbcea9 ("ethdev: remove legacy FDIR filter type support")
---
 app/test-pmd/cmdline.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)
app/test-pmd/cmdline.c +24 -24
index bde0de5..0d2d6aa 100644
@@ -10097,6 +10097,30 @@ struct cmd_show_queue_region_info {
 
 /* *** Filters Control *** */
 
+#define IPV4_ADDR_TO_UINT(ip_addr, ip) \
+do { \
+	if ((ip_addr).family == AF_INET) \
+		(ip) = (ip_addr).addr.ipv4.s_addr; \
+	else { \
+		printf("invalid parameter.\n"); \
+		return; \
+	} \
+} while (0)
+
+#define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
+do { \
+	if ((ip_addr).family == AF_INET6) \
+		rte_memcpy(&(ip), \
+				 &((ip_addr).addr.ipv6), \
+				 sizeof(struct in6_addr)); \
+	else { \
+		printf("invalid parameter.\n"); \
+		return; \
+	} \
+} while (0)
+
+#ifdef RTE_NET_I40E
+
 static uint16_t
 str2flowtype(char *string)
 {
@@ -10132,30 +10156,6 @@ struct cmd_show_queue_region_info {
 	return RTE_ETH_FLOW_UNKNOWN;
 }
 
-#define IPV4_ADDR_TO_UINT(ip_addr, ip) \
-do { \
-	if ((ip_addr).family == AF_INET) \
-		(ip) = (ip_addr).addr.ipv4.s_addr; \
-	else { \
-		printf("invalid parameter.\n"); \
-		return; \
-	} \
-} while (0)
-
-#define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
-do { \
-	if ((ip_addr).family == AF_INET6) \
-		rte_memcpy(&(ip), \
-				 &((ip_addr).addr.ipv6), \
-				 sizeof(struct in6_addr)); \
-	else { \
-		printf("invalid parameter.\n"); \
-		return; \
-	} \
-} while (0)
-
-#ifdef RTE_NET_I40E
-
 /* *** deal with flow director filter *** */
 struct cmd_flow_director_result {
 	cmdline_fixed_string_t flow_director_filter;
Signature · 1 line
1.8.3.1
#2 lore raw

24/11/2020 14:22, Ferruh Yigit:

Quoted 11 lines · Viacheslav Ovsiienko
Quoted 8 lines

If there was no RTE_NET_I40E configured the static routine str2flowtype() was not used causing compilation warning.

The str2flowtype() is moved under #ifdef RTE_NET_I40E block.

Fixes 1be514fbcea9 ("ethdev: remove legacy FDIR filter type support")

Applied, thanks