d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app/testpmd: fix build without i40e

Browse Source 
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: 1be514fbce ("ethdev: remove legacy FDIR filter type support")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Viacheslav Ovsiienko 2020-11-24 11:49:56 +00:00 committed by Thomas Monjalon
parent 4467fed6f9
commit 8f9b743900
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/test-pmd/cmdline.c
View File

@ -10097,6 +10097,30 @@ cmdline_parse_inst_t cmd_show_queue_region_info_all = {
/* *** 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 @@ str2flowtype(char *string)
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;