app/testpmd: fix str2flowtype not used warnings
Checks
Commit Message
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")
Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
app/test-pmd/cmdline.c | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
Comments
On 11/24/2020 11:49 AM, Viacheslav Ovsiienko wrote:
> 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")
>
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
24/11/2020 14:22, Ferruh Yigit:
> On 11/24/2020 11:49 AM, Viacheslav Ovsiienko wrote:
> > 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")
> >
> > Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
>
> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Applied, thanks
@@ -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;