From 472274316713c6b229f108764ec62c4f0150831c Mon Sep 17 00:00:00 2001
From: Intel <intel.com>
Date: Thu, 20 Dec 2012 00:00:00 +0100
Subject: [PATCH] igb: rename pmd driver as e1000

Signed-off-by: Intel
---
 config/defconfig_i686-default-linuxapp-gcc    | 10 +++----
 config/defconfig_i686-default-linuxapp-icc    | 10 +++----
 config/defconfig_x86_64-default-linuxapp-gcc  | 10 +++----
 config/defconfig_x86_64-default-linuxapp-icc  | 10 +++----
 lib/Makefile                                  |  2 +-
 .../Makefile                                  | 30 +++++++++----------
 .../igb => librte_pmd_e1000/e1000}/README     |  0
 .../e1000}/e1000_82575.c                      |  0
 .../e1000}/e1000_82575.h                      |  0
 .../e1000}/e1000_api.c                        |  0
 .../e1000}/e1000_api.h                        |  0
 .../e1000}/e1000_defines.h                    |  0
 .../igb => librte_pmd_e1000/e1000}/e1000_hw.h |  0
 .../e1000}/e1000_mac.c                        |  0
 .../e1000}/e1000_mac.h                        |  0
 .../e1000}/e1000_manage.c                     |  0
 .../e1000}/e1000_manage.h                     |  0
 .../e1000}/e1000_mbx.c                        |  0
 .../e1000}/e1000_mbx.h                        |  0
 .../e1000}/e1000_nvm.c                        |  0
 .../e1000}/e1000_nvm.h                        |  0
 .../e1000}/e1000_osdep.c                      |  0
 .../e1000}/e1000_osdep.h                      |  0
 .../e1000}/e1000_phy.c                        |  0
 .../e1000}/e1000_phy.h                        |  0
 .../e1000}/e1000_regs.h                       |  0
 .../igb => librte_pmd_e1000/e1000}/e1000_vf.c |  0
 .../igb => librte_pmd_e1000/e1000}/e1000_vf.h |  0
 .../igb => librte_pmd_e1000/e1000}/if_igb.c   |  0
 .../igb => librte_pmd_e1000/e1000}/if_igb.h   |  0
 .../e1000_ethdev.h                            |  0
 .../e1000_logs.h                              |  0
 .../igb_ethdev.c}                             |  0
 .../igb_rxtx.c}                               |  0
 mk/rte.app.mk                                 |  4 +--
 mk/rte.vars.mk                                |  2 ++
 36 files changed, 40 insertions(+), 38 deletions(-)
 rename lib/{librte_pmd_igb => librte_pmd_e1000}/Makefile (69%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/README (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_82575.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_82575.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_api.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_api.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_defines.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_hw.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_mac.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_mac.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_manage.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_manage.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_mbx.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_mbx.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_nvm.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_nvm.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_osdep.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_osdep.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_phy.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_phy.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_regs.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_vf.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/e1000_vf.h (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/if_igb.c (100%)
 rename lib/{librte_pmd_igb/igb => librte_pmd_e1000/e1000}/if_igb.h (100%)
 rename lib/{librte_pmd_igb => librte_pmd_e1000}/e1000_ethdev.h (100%)
 rename lib/{librte_pmd_igb => librte_pmd_e1000}/e1000_logs.h (100%)
 rename lib/{librte_pmd_igb/e1000_ethdev.c => librte_pmd_e1000/igb_ethdev.c} (100%)
 rename lib/{librte_pmd_igb/e1000_rxtx.c => librte_pmd_e1000/igb_rxtx.c} (100%)

diff --git a/config/defconfig_i686-default-linuxapp-gcc b/config/defconfig_i686-default-linuxapp-gcc
index d6c7c28623..e07604267f 100644
--- a/config/defconfig_i686-default-linuxapp-gcc
+++ b/config/defconfig_i686-default-linuxapp-gcc
@@ -133,11 +133,11 @@ CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16
 # Compile burst-oriented IGB PMD driver
 #
 CONFIG_RTE_LIBRTE_IGB_PMD=y
-CONFIG_RTE_LIBRTE_IGB_DEBUG_INIT=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_DRIVER=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_INIT=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_DRIVER=n
 
 #
 # Compile burst-oriented IXGBE PMD driver
diff --git a/config/defconfig_i686-default-linuxapp-icc b/config/defconfig_i686-default-linuxapp-icc
index a981dc58e9..591e0e318c 100644
--- a/config/defconfig_i686-default-linuxapp-icc
+++ b/config/defconfig_i686-default-linuxapp-icc
@@ -133,11 +133,11 @@ CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16
 # Compile burst-oriented IGB PMD driver
 #
 CONFIG_RTE_LIBRTE_IGB_PMD=y
-CONFIG_RTE_LIBRTE_IGB_DEBUG_INIT=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_DRIVER=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_INIT=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_DRIVER=n
 
 #
 # Compile burst-oriented IXGBE PMD driver
diff --git a/config/defconfig_x86_64-default-linuxapp-gcc b/config/defconfig_x86_64-default-linuxapp-gcc
index 3ddc39dda7..5da27c8557 100644
--- a/config/defconfig_x86_64-default-linuxapp-gcc
+++ b/config/defconfig_x86_64-default-linuxapp-gcc
@@ -133,11 +133,11 @@ CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16
 # Compile burst-oriented IGB PMD driver
 #
 CONFIG_RTE_LIBRTE_IGB_PMD=y
-CONFIG_RTE_LIBRTE_IGB_DEBUG_INIT=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_DRIVER=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_INIT=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_DRIVER=n
 
 #
 # Compile burst-oriented IXGBE PMD driver
diff --git a/config/defconfig_x86_64-default-linuxapp-icc b/config/defconfig_x86_64-default-linuxapp-icc
index 63e3aa60f8..401f911e83 100644
--- a/config/defconfig_x86_64-default-linuxapp-icc
+++ b/config/defconfig_x86_64-default-linuxapp-icc
@@ -133,11 +133,11 @@ CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS=16
 # Compile burst-oriented IGB PMD driver
 #
 CONFIG_RTE_LIBRTE_IGB_PMD=y
-CONFIG_RTE_LIBRTE_IGB_DEBUG_INIT=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_RX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_TX_FREE=n
-CONFIG_RTE_LIBRTE_IGB_DEBUG_DRIVER=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_INIT=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_DRIVER=n
 
 #
 # Compile burst-oriented IXGBE PMD driver
diff --git a/lib/Makefile b/lib/Makefile
index 7cffb84842..06da89e51f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -41,7 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_MBUF) += librte_mbuf
 DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer
 DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline
 DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether
-DIRS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += librte_pmd_igb
+DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += librte_pmd_e1000
 DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_ixgbe
 DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm
diff --git a/lib/librte_pmd_igb/Makefile b/lib/librte_pmd_e1000/Makefile
similarity index 69%
rename from lib/librte_pmd_igb/Makefile
rename to lib/librte_pmd_e1000/Makefile
index b0dec403d2..a3c88e88fb 100644
--- a/lib/librte_pmd_igb/Makefile
+++ b/lib/librte_pmd_e1000/Makefile
@@ -35,7 +35,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 #
 # library name
 #
-LIB = librte_pmd_igb.a
+LIB = librte_pmd_e1000.a
 
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
@@ -43,21 +43,21 @@ CFLAGS += $(WERROR_FLAGS)
 #
 # all source are stored in SRCS-y
 #
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_nvm.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_manage.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_mac.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_phy.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_82575.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_api.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_osdep.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb/e1000_mbx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += e1000_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += e1000_ethdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82575.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_api.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mac.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_manage.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mbx.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_nvm.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_osdep.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_phy.c
+SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_vf.c
+SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_ethdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_rxtx.c
 
 # this lib depends upon:
-DEPDIRS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += lib/librte_eal lib/librte_ether
-DEPDIRS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += lib/librte_mempool lib/librte_mbuf
-DEPDIRS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += lib/librte_net lib/librte_malloc
+DEPDIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += lib/librte_eal lib/librte_ether
+DEPDIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += lib/librte_mempool lib/librte_mbuf
+DEPDIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += lib/librte_net lib/librte_malloc
 
 include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_pmd_igb/igb/README b/lib/librte_pmd_e1000/e1000/README
similarity index 100%
rename from lib/librte_pmd_igb/igb/README
rename to lib/librte_pmd_e1000/e1000/README
diff --git a/lib/librte_pmd_igb/igb/e1000_82575.c b/lib/librte_pmd_e1000/e1000/e1000_82575.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_82575.c
rename to lib/librte_pmd_e1000/e1000/e1000_82575.c
diff --git a/lib/librte_pmd_igb/igb/e1000_82575.h b/lib/librte_pmd_e1000/e1000/e1000_82575.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_82575.h
rename to lib/librte_pmd_e1000/e1000/e1000_82575.h
diff --git a/lib/librte_pmd_igb/igb/e1000_api.c b/lib/librte_pmd_e1000/e1000/e1000_api.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_api.c
rename to lib/librte_pmd_e1000/e1000/e1000_api.c
diff --git a/lib/librte_pmd_igb/igb/e1000_api.h b/lib/librte_pmd_e1000/e1000/e1000_api.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_api.h
rename to lib/librte_pmd_e1000/e1000/e1000_api.h
diff --git a/lib/librte_pmd_igb/igb/e1000_defines.h b/lib/librte_pmd_e1000/e1000/e1000_defines.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_defines.h
rename to lib/librte_pmd_e1000/e1000/e1000_defines.h
diff --git a/lib/librte_pmd_igb/igb/e1000_hw.h b/lib/librte_pmd_e1000/e1000/e1000_hw.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_hw.h
rename to lib/librte_pmd_e1000/e1000/e1000_hw.h
diff --git a/lib/librte_pmd_igb/igb/e1000_mac.c b/lib/librte_pmd_e1000/e1000/e1000_mac.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_mac.c
rename to lib/librte_pmd_e1000/e1000/e1000_mac.c
diff --git a/lib/librte_pmd_igb/igb/e1000_mac.h b/lib/librte_pmd_e1000/e1000/e1000_mac.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_mac.h
rename to lib/librte_pmd_e1000/e1000/e1000_mac.h
diff --git a/lib/librte_pmd_igb/igb/e1000_manage.c b/lib/librte_pmd_e1000/e1000/e1000_manage.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_manage.c
rename to lib/librte_pmd_e1000/e1000/e1000_manage.c
diff --git a/lib/librte_pmd_igb/igb/e1000_manage.h b/lib/librte_pmd_e1000/e1000/e1000_manage.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_manage.h
rename to lib/librte_pmd_e1000/e1000/e1000_manage.h
diff --git a/lib/librte_pmd_igb/igb/e1000_mbx.c b/lib/librte_pmd_e1000/e1000/e1000_mbx.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_mbx.c
rename to lib/librte_pmd_e1000/e1000/e1000_mbx.c
diff --git a/lib/librte_pmd_igb/igb/e1000_mbx.h b/lib/librte_pmd_e1000/e1000/e1000_mbx.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_mbx.h
rename to lib/librte_pmd_e1000/e1000/e1000_mbx.h
diff --git a/lib/librte_pmd_igb/igb/e1000_nvm.c b/lib/librte_pmd_e1000/e1000/e1000_nvm.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_nvm.c
rename to lib/librte_pmd_e1000/e1000/e1000_nvm.c
diff --git a/lib/librte_pmd_igb/igb/e1000_nvm.h b/lib/librte_pmd_e1000/e1000/e1000_nvm.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_nvm.h
rename to lib/librte_pmd_e1000/e1000/e1000_nvm.h
diff --git a/lib/librte_pmd_igb/igb/e1000_osdep.c b/lib/librte_pmd_e1000/e1000/e1000_osdep.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_osdep.c
rename to lib/librte_pmd_e1000/e1000/e1000_osdep.c
diff --git a/lib/librte_pmd_igb/igb/e1000_osdep.h b/lib/librte_pmd_e1000/e1000/e1000_osdep.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_osdep.h
rename to lib/librte_pmd_e1000/e1000/e1000_osdep.h
diff --git a/lib/librte_pmd_igb/igb/e1000_phy.c b/lib/librte_pmd_e1000/e1000/e1000_phy.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_phy.c
rename to lib/librte_pmd_e1000/e1000/e1000_phy.c
diff --git a/lib/librte_pmd_igb/igb/e1000_phy.h b/lib/librte_pmd_e1000/e1000/e1000_phy.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_phy.h
rename to lib/librte_pmd_e1000/e1000/e1000_phy.h
diff --git a/lib/librte_pmd_igb/igb/e1000_regs.h b/lib/librte_pmd_e1000/e1000/e1000_regs.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_regs.h
rename to lib/librte_pmd_e1000/e1000/e1000_regs.h
diff --git a/lib/librte_pmd_igb/igb/e1000_vf.c b/lib/librte_pmd_e1000/e1000/e1000_vf.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_vf.c
rename to lib/librte_pmd_e1000/e1000/e1000_vf.c
diff --git a/lib/librte_pmd_igb/igb/e1000_vf.h b/lib/librte_pmd_e1000/e1000/e1000_vf.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/e1000_vf.h
rename to lib/librte_pmd_e1000/e1000/e1000_vf.h
diff --git a/lib/librte_pmd_igb/igb/if_igb.c b/lib/librte_pmd_e1000/e1000/if_igb.c
similarity index 100%
rename from lib/librte_pmd_igb/igb/if_igb.c
rename to lib/librte_pmd_e1000/e1000/if_igb.c
diff --git a/lib/librte_pmd_igb/igb/if_igb.h b/lib/librte_pmd_e1000/e1000/if_igb.h
similarity index 100%
rename from lib/librte_pmd_igb/igb/if_igb.h
rename to lib/librte_pmd_e1000/e1000/if_igb.h
diff --git a/lib/librte_pmd_igb/e1000_ethdev.h b/lib/librte_pmd_e1000/e1000_ethdev.h
similarity index 100%
rename from lib/librte_pmd_igb/e1000_ethdev.h
rename to lib/librte_pmd_e1000/e1000_ethdev.h
diff --git a/lib/librte_pmd_igb/e1000_logs.h b/lib/librte_pmd_e1000/e1000_logs.h
similarity index 100%
rename from lib/librte_pmd_igb/e1000_logs.h
rename to lib/librte_pmd_e1000/e1000_logs.h
diff --git a/lib/librte_pmd_igb/e1000_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c
similarity index 100%
rename from lib/librte_pmd_igb/e1000_ethdev.c
rename to lib/librte_pmd_e1000/igb_ethdev.c
diff --git a/lib/librte_pmd_igb/e1000_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
similarity index 100%
rename from lib/librte_pmd_igb/e1000_rxtx.c
rename to lib/librte_pmd_e1000/igb_rxtx.c
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index fbb578858d..68ef9e7a49 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -65,8 +65,8 @@ LDLIBS += -lrte_kni
 endif
 endif
 
-ifeq ($(CONFIG_RTE_LIBRTE_IGB_PMD),y)
-LDLIBS += -lrte_pmd_igb
+ifeq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y)
+LDLIBS += -lrte_pmd_e1000
 endif
 
 ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index 733aff0b96..c45d4c00ae 100644
--- a/mk/rte.vars.mk
+++ b/mk/rte.vars.mk
@@ -79,6 +79,8 @@ ifeq ($(BUILDING_RTE_SDK),)
 include $(RTE_SDK)/mk/rte.extvars.mk
 endif
 
+CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD)
+
 ifeq ($(RTE_ARCH),)
 $(error RTE_ARCH is not defined)
 endif
-- 
2.39.5