summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-06-29 17:08:05 +0200
committerDamjan Marion <damarion@cisco.com>2018-06-29 17:08:05 +0200
commitef8ead55e519091cc139ba3ef35c72564f1f8dc1 (patch)
tree9cd34c2ce7520ba5c4d10392d6ecdc5d270b5fe3
parenta21a36763b4f68d3ca42d4d03b44ab2494b3e3ab (diff)
memif: minor fixes
Change-Id: Ib06d9ce0fad48b784fd47db13c7a2f353c845fca Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/plugins/memif.am16
-rw-r--r--src/plugins/memif/device.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/memif.am b/src/plugins/memif.am
index 33a378f4a3f..e7deb7dac7a 100644
--- a/src/plugins/memif.am
+++ b/src/plugins/memif.am
@@ -44,24 +44,24 @@ if CC_SUPPORTS_AVX2
###############################################################
# AVX2
###############################################################
-libmemif_plugin_avx2_la_SOURCES = $(memif_multiversioning_sources)
-libmemif_plugin_avx2_la_CFLAGS = \
+memif_plugin_avx2_la_SOURCES = $(memif_multiversioning_sources)
+memif_plugin_avx2_la_CFLAGS = \
$(AM_CFLAGS) @CPU_AVX2_FLAGS@ \
-DCLIB_MARCH_VARIANT=avx2
-noinst_LTLIBRARIES += libmemif_plugin_avx2.la
-memif_plugin_la_LIBADD += libmemif_plugin_avx2.la
+noinst_LTLIBRARIES += memif_plugin_avx2.la
+memif_plugin_la_LIBADD += memif_plugin_avx2.la
endif
if CC_SUPPORTS_AVX512
###############################################################
# AVX512
###############################################################
-libmemif_plugin_avx512_la_SOURCES = $(memif_multiversioning_sources)
-libmemif_plugin_avx512_la_CFLAGS = \
+memif_plugin_avx512_la_SOURCES = $(memif_multiversioning_sources)
+memif_plugin_avx512_la_CFLAGS = \
$(AM_CFLAGS) @CPU_AVX512_FLAGS@ \
-DCLIB_MARCH_VARIANT=avx512
-noinst_LTLIBRARIES += libmemif_plugin_avx512.la
-memif_plugin_la_LIBADD += libmemif_plugin_avx512.la
+noinst_LTLIBRARIES += memif_plugin_avx512.la
+memif_plugin_la_LIBADD += memif_plugin_avx512.la
endif
endif
diff --git a/src/plugins/memif/device.c b/src/plugins/memif/device.c
index 14b9d547234..87c9404bd8e 100644
--- a/src/plugins/memif/device.c
+++ b/src/plugins/memif/device.c
@@ -521,7 +521,7 @@ VNET_DEVICE_CLASS (memif_device_class) = {
vlib_node_function_t __clib_weak memif_interface_tx_avx512;
vlib_node_function_t __clib_weak memif_interface_tx_avx2;
static void __clib_constructor
-dpdk_interface_tx_multiarch_select (void)
+memif_interface_tx_multiarch_select (void)
{
if (memif_interface_tx_avx512 && clib_cpu_supports_avx512f ())
memif_device_class.tx_function = memif_interface_tx_avx512;