Skip to contentSkip to conversation

net/i40e: fix missing defines for non-AVX builds

PATCH In review Bruce Richardson 1 participant 2 messages May 8, 2018

Subsystems (2)
Network drivers Arm/Amlogic Meson SoC support
lore
Share & tools
lore

Bruce Richardson

author
#0 lore raw

PATCH 1/1 net/i40e: fix missing defines for non-AVX builds

For non-AVX builds, the cflags used for compiling the i40e driver files are not passed to the call to build the AVX-specific code path. This can cause build failures.

../drivers/net/i40e/i40e_ethdev.h:888:42: error: ‘I40E_PFQF_HKEY_MAX_INDEX’ undeclared here (not in a function)

Fixes e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")
Reported-by Shreyansh Jain <[email protected]>
Signed-off-by Bruce Richardson <[email protected]>
Tested-by Shreyansh Jain <[email protected]>

----
Testing previously done on draft version of this patch. Ref:
http://dpdk.org/ml/archives/dev/2018-May/100301.html

---
 drivers/net/i40e/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/i40e/meson.build +3 -3
index f2129df07..d783f3626 100644
@@ -25,6 +25,7 @@ sources = files(
 	)
 
 deps += ['hash']
+includes += include_directories('base')
 
 if arch_subdir == 'x86'
 	dpdk_conf.set('RTE_LIBRTE_I40E_INC_VECTOR', 1)

@@ -40,11 +41,10 @@ if arch_subdir == 'x86'
 				'i40e_rxtx_vec_avx2.c',
 				dependencies: [static_rte_ethdev,
 					static_rte_kvargs, static_rte_hash],
-				c_args: '-mavx2')
+				include_directories: includes,
+				c_args: [cflags, '-mavx2'])
 		objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
 	endif
 endif
 
-includes += include_directories('base')
-
 install_headers('rte_pmd_i40e.h')
Signature · 1 line
2.14.3
author
#1 lore raw
Quoted 6 lines · Bruce Richardson

For non-AVX builds, the cflags used for compiling the i40e driver files are not passed to the call to build the AVX-specific code path. This can cause build failures.

../drivers/net/i40e/i40e_ethdev.h:888:42: error: ‘I40E_PFQF_HKEY_MAX_INDEX’ undeclared here (not in a function)

Quoted 7 lines
Fixes e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")
Reported-by Shreyansh Jain <[email protected]>
Signed-off-by Bruce Richardson <[email protected]>
Tested-by Shreyansh Jain <[email protected]>

----

Applied to dpdk-next-build

/Bruce