summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyi Rong <leyi.rong@intel.com>2019-02-26 01:18:51 +0800
committerFerruh Yigit <ferruh.yigit@intel.com>2019-03-01 18:17:35 +0100
commit3ded348378a76622e22a9017455de02c8c4048b5 (patch)
tree306060c8b59ce2d2c49690fd776d85061d167aaf
parent4bcb9b7686043fe9a4e669f2d7f5acee603f5409 (diff)
downloaddpdk-draft-windows-3ded348378a76622e22a9017455de02c8c4048b5.zip
dpdk-draft-windows-3ded348378a76622e22a9017455de02c8c4048b5.tar.gz
dpdk-draft-windows-3ded348378a76622e22a9017455de02c8c4048b5.tar.xz
net/iavf: rename avf to iavf
Rename Intel Ethernet Adaptive Virtual Function driver avf to iavf. This is the first patch which will only renames the directory name, lib name, filenames and updates the new name in makefile and meson files. Also updates the #include files in source files. Signed-off-by: Leyi Rong <leyi.rong@intel.com> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
-rw-r--r--MAINTAINERS6
-rw-r--r--doc/guides/nics/features/iavf.ini (renamed from doc/guides/nics/features/avf.ini)2
-rw-r--r--doc/guides/nics/features/iavf_vec.ini (renamed from doc/guides/nics/features/avf_vec.ini)2
-rw-r--r--drivers/net/Makefile2
-rw-r--r--drivers/net/iavf/Makefile (renamed from drivers/net/avf/Makefile)16
-rw-r--r--drivers/net/iavf/base/README (renamed from drivers/net/avf/base/README)0
-rw-r--r--drivers/net/iavf/base/iavf_adminq.c (renamed from drivers/net/avf/base/avf_adminq.c)10
-rw-r--r--drivers/net/iavf/base/iavf_adminq.h (renamed from drivers/net/avf/base/avf_adminq.h)6
-rw-r--r--drivers/net/iavf/base/iavf_adminq_cmd.h (renamed from drivers/net/avf/base/avf_adminq_cmd.h)0
-rw-r--r--drivers/net/iavf/base/iavf_alloc.h (renamed from drivers/net/avf/base/avf_alloc.h)0
-rw-r--r--drivers/net/iavf/base/iavf_common.c (renamed from drivers/net/avf/base/avf_common.c)6
-rw-r--r--drivers/net/iavf/base/iavf_devids.h (renamed from drivers/net/avf/base/avf_devids.h)0
-rw-r--r--drivers/net/iavf/base/iavf_hmc.h (renamed from drivers/net/avf/base/avf_hmc.h)0
-rw-r--r--drivers/net/iavf/base/iavf_lan_hmc.h (renamed from drivers/net/avf/base/avf_lan_hmc.h)0
-rw-r--r--drivers/net/iavf/base/iavf_osdep.h (renamed from drivers/net/avf/base/avf_osdep.h)2
-rw-r--r--drivers/net/iavf/base/iavf_prototype.h (renamed from drivers/net/avf/base/avf_prototype.h)4
-rw-r--r--drivers/net/iavf/base/iavf_register.h (renamed from drivers/net/avf/base/avf_register.h)0
-rw-r--r--drivers/net/iavf/base/iavf_status.h (renamed from drivers/net/avf/base/avf_status.h)0
-rw-r--r--drivers/net/iavf/base/iavf_type.h (renamed from drivers/net/avf/base/avf_type.h)14
-rw-r--r--drivers/net/iavf/base/meson.build (renamed from drivers/net/avf/base/meson.build)6
-rw-r--r--drivers/net/iavf/base/virtchnl.h (renamed from drivers/net/avf/base/virtchnl.h)0
-rw-r--r--drivers/net/iavf/iavf.h (renamed from drivers/net/avf/avf.h)0
-rw-r--r--drivers/net/iavf/iavf_ethdev.c (renamed from drivers/net/avf/avf_ethdev.c)12
-rw-r--r--drivers/net/iavf/iavf_log.h (renamed from drivers/net/avf/avf_log.h)0
-rw-r--r--drivers/net/iavf/iavf_rxtx.c (renamed from drivers/net/avf/avf_rxtx.c)10
-rw-r--r--drivers/net/iavf/iavf_rxtx.h (renamed from drivers/net/avf/avf_rxtx.h)0
-rw-r--r--drivers/net/iavf/iavf_rxtx_vec_common.h (renamed from drivers/net/avf/avf_rxtx_vec_common.h)4
-rw-r--r--drivers/net/iavf/iavf_rxtx_vec_sse.c (renamed from drivers/net/avf/avf_rxtx_vec_sse.c)10
-rw-r--r--drivers/net/iavf/iavf_vchnl.c (renamed from drivers/net/avf/avf_vchnl.c)12
-rw-r--r--drivers/net/iavf/meson.build (renamed from drivers/net/avf/meson.build)8
-rw-r--r--drivers/net/iavf/rte_pmd_iavf_version.map (renamed from drivers/net/avf/rte_pmd_avf_version.map)0
-rw-r--r--drivers/net/meson.build2
-rw-r--r--mk/rte.app.mk2
33 files changed, 68 insertions, 68 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f96d87a..097cfb4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -575,12 +575,12 @@ F: drivers/net/fm10k/
F: doc/guides/nics/fm10k.rst
F: doc/guides/nics/features/fm10k*.ini
-Intel avf
+Intel iavf
M: Jingjing Wu <jingjing.wu@intel.com>
M: Wenzhuo Lu <wenzhuo.lu@intel.com>
T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/avf/
-F: doc/guides/nics/features/avf*.ini
+F: drivers/net/iavf/
+F: doc/guides/nics/features/iavf*.ini
Intel ifc
M: Xiao Wang <xiao.w.wang@intel.com>
diff --git a/doc/guides/nics/features/avf.ini b/doc/guides/nics/features/iavf.ini
index 35ceada..8014305 100644
--- a/doc/guides/nics/features/avf.ini
+++ b/doc/guides/nics/features/iavf.ini
@@ -1,5 +1,5 @@
;
-; Supported features of the 'avf' network poll mode driver.
+; Supported features of the 'iavf' network poll mode driver.
;
; Refer to default.ini for the full list of available PMD features.
;
diff --git a/doc/guides/nics/features/avf_vec.ini b/doc/guides/nics/features/iavf_vec.ini
index 3050bc4..167f5fd 100644
--- a/doc/guides/nics/features/avf_vec.ini
+++ b/doc/guides/nics/features/iavf_vec.ini
@@ -1,5 +1,5 @@
;
-; Supported features of the 'avf_vec' network poll mode driver.
+; Supported features of the 'iavf_vec' network poll mode driver.
;
; Refer to default.ini for the full list of available PMD features.
;
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 670d7f7..dea4b0c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -11,7 +11,6 @@ endif
DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet
DIRS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark
DIRS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atlantic
-DIRS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf
DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp
DIRS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe
DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x
@@ -30,6 +29,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic
DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe
DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k
DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e
+DIRS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf
DIRS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice
DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe
DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio
diff --git a/drivers/net/avf/Makefile b/drivers/net/iavf/Makefile
index aec6e4c..29ff3c2 100644
--- a/drivers/net/avf/Makefile
+++ b/drivers/net/iavf/Makefile
@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
#
# library name
#
-LIB = librte_pmd_avf.a
+LIB = librte_pmd_iavf.a
CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing -DALLOW_EXPERIMENTAL_API
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
@@ -16,7 +16,7 @@ LDLIBS += -lrte_bus_pci
# used to dump HW descriptor for debugging
# CFLAGS += -DDEBUG_DUMP_DESC
-EXPORT_MAP := rte_pmd_avf_version.map
+EXPORT_MAP := rte_pmd_iavf_version.map
LIBABIVER := 1
@@ -41,14 +41,14 @@ VPATH += $(SRCDIR)/base
#
# all source are stored in SRCS-y
#
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_adminq.c
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_common.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_adminq.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_vchnl.c
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += avf_rxtx.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_ethdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_vchnl.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += iavf_rxtx.c
ifeq ($(CONFIG_RTE_ARCH_X86), y)
-SRCS-$(CONFIG_RTE_LIBRTE_AVF_INC_VECTOR) += avf_rxtx_vec_sse.c
+SRCS-$(CONFIG_RTE_LIBRTE_AVF_INC_VECTOR) += iavf_rxtx_vec_sse.c
endif
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/avf/base/README b/drivers/net/iavf/base/README
index 4710ae2..4710ae2 100644
--- a/drivers/net/avf/base/README
+++ b/drivers/net/iavf/base/README
diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
index 616e2a9..9d16f0f 100644
--- a/drivers/net/avf/base/avf_adminq.c
+++ b/drivers/net/iavf/base/iavf_adminq.c
@@ -31,11 +31,11 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-#include "avf_status.h"
-#include "avf_type.h"
-#include "avf_register.h"
-#include "avf_adminq.h"
-#include "avf_prototype.h"
+#include "iavf_status.h"
+#include "iavf_type.h"
+#include "iavf_register.h"
+#include "iavf_adminq.h"
+#include "iavf_prototype.h"
/**
* avf_adminq_init_regs - Initialize AdminQ registers
diff --git a/drivers/net/avf/base/avf_adminq.h b/drivers/net/iavf/base/iavf_adminq.h
index d7d242a..ce72fb5 100644
--- a/drivers/net/avf/base/avf_adminq.h
+++ b/drivers/net/iavf/base/iavf_adminq.h
@@ -34,9 +34,9 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef _AVF_ADMINQ_H_
#define _AVF_ADMINQ_H_
-#include "avf_osdep.h"
-#include "avf_status.h"
-#include "avf_adminq_cmd.h"
+#include "iavf_osdep.h"
+#include "iavf_status.h"
+#include "iavf_adminq_cmd.h"
#define AVF_ADMINQ_DESC(R, i) \
(&(((struct avf_aq_desc *)((R).desc_buf.va))[i]))
diff --git a/drivers/net/avf/base/avf_adminq_cmd.h b/drivers/net/iavf/base/iavf_adminq_cmd.h
index 7954911..7954911 100644
--- a/drivers/net/avf/base/avf_adminq_cmd.h
+++ b/drivers/net/iavf/base/iavf_adminq_cmd.h
diff --git a/drivers/net/avf/base/avf_alloc.h b/drivers/net/iavf/base/iavf_alloc.h
index 21e29bd..21e29bd 100644
--- a/drivers/net/avf/base/avf_alloc.h
+++ b/drivers/net/iavf/base/iavf_alloc.h
diff --git a/drivers/net/avf/base/avf_common.c b/drivers/net/iavf/base/iavf_common.c
index bbaadad..5b7f091 100644
--- a/drivers/net/avf/base/avf_common.c
+++ b/drivers/net/iavf/base/iavf_common.c
@@ -31,9 +31,9 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-#include "avf_type.h"
-#include "avf_adminq.h"
-#include "avf_prototype.h"
+#include "iavf_type.h"
+#include "iavf_adminq.h"
+#include "iavf_prototype.h"
#include "virtchnl.h"
diff --git a/drivers/net/avf/base/avf_devids.h b/drivers/net/iavf/base/iavf_devids.h
index 7d9fed2..7d9fed2 100644
--- a/drivers/net/avf/base/avf_devids.h
+++ b/drivers/net/iavf/base/iavf_devids.h
diff --git a/drivers/net/avf/base/avf_hmc.h b/drivers/net/iavf/base/iavf_hmc.h
index b9b7b5b..b9b7b5b 100644
--- a/drivers/net/avf/base/avf_hmc.h
+++ b/drivers/net/iavf/base/iavf_hmc.h
diff --git a/drivers/net/avf/base/avf_lan_hmc.h b/drivers/net/iavf/base/iavf_lan_hmc.h
index 48805d8..48805d8 100644
--- a/drivers/net/avf/base/avf_lan_hmc.h
+++ b/drivers/net/iavf/base/iavf_lan_hmc.h
diff --git a/drivers/net/avf/base/avf_osdep.h b/drivers/net/iavf/base/iavf_osdep.h
index 442a5ac..1f12266 100644
--- a/drivers/net/avf/base/avf_osdep.h
+++ b/drivers/net/iavf/base/iavf_osdep.h
@@ -21,7 +21,7 @@
#include <rte_log.h>
#include <rte_io.h>
-#include "../avf_log.h"
+#include "../iavf_log.h"
#define INLINE inline
#define STATIC static
diff --git a/drivers/net/avf/base/avf_prototype.h b/drivers/net/iavf/base/iavf_prototype.h
index de031dc..8230d5c 100644
--- a/drivers/net/avf/base/avf_prototype.h
+++ b/drivers/net/iavf/base/iavf_prototype.h
@@ -34,8 +34,8 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef _AVF_PROTOTYPE_H_
#define _AVF_PROTOTYPE_H_
-#include "avf_type.h"
-#include "avf_alloc.h"
+#include "iavf_type.h"
+#include "iavf_alloc.h"
#include "virtchnl.h"
/* Prototypes for shared code functions that are not in
diff --git a/drivers/net/avf/base/avf_register.h b/drivers/net/iavf/base/iavf_register.h
index adb9895..adb9895 100644
--- a/drivers/net/avf/base/avf_register.h
+++ b/drivers/net/iavf/base/iavf_register.h
diff --git a/drivers/net/avf/base/avf_status.h b/drivers/net/iavf/base/iavf_status.h
index e8a673b..e8a673b 100644
--- a/drivers/net/avf/base/avf_status.h
+++ b/drivers/net/iavf/base/iavf_status.h
diff --git a/drivers/net/avf/base/avf_type.h b/drivers/net/iavf/base/iavf_type.h
index 546c6d2..7c59073 100644
--- a/drivers/net/avf/base/avf_type.h
+++ b/drivers/net/iavf/base/iavf_type.h
@@ -34,13 +34,13 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef _AVF_TYPE_H_
#define _AVF_TYPE_H_
-#include "avf_status.h"
-#include "avf_osdep.h"
-#include "avf_register.h"
-#include "avf_adminq.h"
-#include "avf_hmc.h"
-#include "avf_lan_hmc.h"
-#include "avf_devids.h"
+#include "iavf_status.h"
+#include "iavf_osdep.h"
+#include "iavf_register.h"
+#include "iavf_adminq.h"
+#include "iavf_hmc.h"
+#include "iavf_lan_hmc.h"
+#include "iavf_devids.h"
#define UNREFERENCED_XPARAMETER
#define UNREFERENCED_1PARAMETER(_p) (_p);
diff --git a/drivers/net/avf/base/meson.build b/drivers/net/iavf/base/meson.build
index 6f3d719..bcb24b7 100644
--- a/drivers/net/avf/base/meson.build
+++ b/drivers/net/iavf/base/meson.build
@@ -2,8 +2,8 @@
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
sources = [
- 'avf_adminq.c',
- 'avf_common.c',
+ 'iavf_adminq.c',
+ 'iavf_common.c',
]
error_cflags = ['-Wno-pointer-to-int-cast']
@@ -17,7 +17,7 @@ foreach flag: error_cflags
endif
endforeach
-base_lib = static_library('avf_base', sources,
+base_lib = static_library('iavf_base', sources,
dependencies: static_rte_eal,
c_args: c_args)
base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/avf/base/virtchnl.h b/drivers/net/iavf/base/virtchnl.h
index 167518f..167518f 100644
--- a/drivers/net/avf/base/virtchnl.h
+++ b/drivers/net/iavf/base/virtchnl.h
diff --git a/drivers/net/avf/avf.h b/drivers/net/iavf/iavf.h
index dcf8d1c..dcf8d1c 100644
--- a/drivers/net/avf/avf.h
+++ b/drivers/net/iavf/iavf.h
diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 797f505..efc20e1 100644
--- a/drivers/net/avf/avf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -25,13 +25,13 @@
#include <rte_memzone.h>
#include <rte_dev.h>
-#include "avf_log.h"
-#include "base/avf_prototype.h"
-#include "base/avf_adminq_cmd.h"
-#include "base/avf_type.h"
+#include "iavf_log.h"
+#include "base/iavf_prototype.h"
+#include "base/iavf_adminq_cmd.h"
+#include "base/iavf_type.h"
-#include "avf.h"
-#include "avf_rxtx.h"
+#include "iavf.h"
+#include "iavf_rxtx.h"
static int avf_dev_configure(struct rte_eth_dev *dev);
static int avf_dev_start(struct rte_eth_dev *dev);
diff --git a/drivers/net/avf/avf_log.h b/drivers/net/iavf/iavf_log.h
index 8d574d3..8d574d3 100644
--- a/drivers/net/avf/avf_log.h
+++ b/drivers/net/iavf/iavf_log.h
diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 8c7a967..988a68f 100644
--- a/drivers/net/avf/avf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -24,11 +24,11 @@
#include <rte_ip.h>
#include <rte_net.h>
-#include "avf_log.h"
-#include "base/avf_prototype.h"
-#include "base/avf_type.h"
-#include "avf.h"
-#include "avf_rxtx.h"
+#include "iavf_log.h"
+#include "base/iavf_prototype.h"
+#include "base/iavf_type.h"
+#include "iavf.h"
+#include "iavf_rxtx.h"
static inline int
check_rx_thresh(uint16_t nb_desc, uint16_t thresh)
diff --git a/drivers/net/avf/avf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h
index ffc835d..ffc835d 100644
--- a/drivers/net/avf/avf_rxtx.h
+++ b/drivers/net/iavf/iavf_rxtx.h
diff --git a/drivers/net/avf/avf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h
index 8057b96..16433e5 100644
--- a/drivers/net/avf/avf_rxtx_vec_common.h
+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h
@@ -8,8 +8,8 @@
#include <rte_ethdev_driver.h>
#include <rte_malloc.h>
-#include "avf.h"
-#include "avf_rxtx.h"
+#include "iavf.h"
+#include "iavf_rxtx.h"
static inline uint16_t
reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs,
diff --git a/drivers/net/avf/avf_rxtx_vec_sse.c b/drivers/net/iavf/iavf_rxtx_vec_sse.c
index 343a6aa..7071ed6 100644
--- a/drivers/net/avf/avf_rxtx_vec_sse.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_sse.c
@@ -6,11 +6,11 @@
#include <rte_ethdev_driver.h>
#include <rte_malloc.h>
-#include "base/avf_prototype.h"
-#include "base/avf_type.h"
-#include "avf.h"
-#include "avf_rxtx.h"
-#include "avf_rxtx_vec_common.h"
+#include "base/iavf_prototype.h"
+#include "base/iavf_type.h"
+#include "iavf.h"
+#include "iavf_rxtx.h"
+#include "iavf_rxtx_vec_common.h"
#include <tmmintrin.h>
diff --git a/drivers/net/avf/avf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index fd90cc2..9b62553 100644
--- a/drivers/net/avf/avf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -19,13 +19,13 @@
#include <rte_ethdev_driver.h>
#include <rte_dev.h>
-#include "avf_log.h"
-#include "base/avf_prototype.h"
-#include "base/avf_adminq_cmd.h"
-#include "base/avf_type.h"
+#include "iavf_log.h"
+#include "base/iavf_prototype.h"
+#include "base/iavf_adminq_cmd.h"
+#include "base/iavf_type.h"
-#include "avf.h"
-#include "avf_rxtx.h"
+#include "iavf.h"
+#include "iavf_rxtx.h"
#define MAX_TRY_TIMES 200
#define ASQ_DELAY_MS 10
diff --git a/drivers/net/avf/meson.build b/drivers/net/iavf/meson.build
index 2dfda9d..bc22ad1 100644
--- a/drivers/net/avf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -9,12 +9,12 @@ subdir('base')
objs = [base_objs]
sources = files(
- 'avf_ethdev.c',
- 'avf_rxtx.c',
- 'avf_vchnl.c',
+ 'iavf_ethdev.c',
+ 'iavf_rxtx.c',
+ 'iavf_vchnl.c',
)
if arch_subdir == 'x86'
dpdk_conf.set('RTE_LIBRTE_AVF_INC_VECTOR', 1)
- sources += files('avf_rxtx_vec_sse.c')
+ sources += files('iavf_rxtx_vec_sse.c')
endif
diff --git a/drivers/net/avf/rte_pmd_avf_version.map b/drivers/net/iavf/rte_pmd_iavf_version.map
index 179140f..179140f 100644
--- a/drivers/net/avf/rte_pmd_avf_version.map
+++ b/drivers/net/iavf/rte_pmd_iavf_version.map
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 45da3bb..3ecc78c 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -4,7 +4,6 @@
drivers = ['af_packet',
'ark',
'atlantic',
- 'avf',
'avp',
'axgbe', 'bonding',
'bnx2x',
@@ -17,6 +16,7 @@ drivers = ['af_packet',
'enic',
'failsafe',
'fm10k', 'i40e',
+ 'iavf',
'ice',
'ifc',
'ixgbe',
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index d0ab942..f8ba98d 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -145,7 +145,6 @@ endif
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet
_LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += -lrte_pmd_ark
_LDLIBS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += -lrte_pmd_atlantic
-_LDLIBS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += -lrte_pmd_avf
_LDLIBS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += -lrte_pmd_avp
_LDLIBS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += -lrte_pmd_axgbe
_LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lrte_pmd_bnx2x -lz
@@ -165,6 +164,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic
_LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += -lrte_pmd_fm10k
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += -lrte_pmd_failsafe
_LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += -lrte_pmd_i40e
+_LDLIBS-$(CONFIG_RTE_LIBRTE_AVF_PMD) += -lrte_pmd_iavf
_LDLIBS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += -lrte_pmd_ice
_LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += -lrte_pmd_ixgbe
ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)