[dpdk-dev] [PATCH 14/19] igbvf: move igbvf pmd to use PMD_INIT macro
Neil Horman
nhorman at tuxdriver.com
Thu Apr 10 22:50:04 CEST 2014
Removed references to core library so that it can be linked in whenever needed
Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
---
lib/librte_ether/rte_ethdev.c | 7 -------
lib/librte_ether/rte_ethdev.h | 9 ---------
lib/librte_pmd_e1000/igb_ethdev.c | 3 ++-
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 6e85451..29eeef3 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -146,13 +146,6 @@ int rte_pmd_init_all(void)
int ret = -ENODEV;
struct pmd_entry *entry;
-#ifdef RTE_LIBRTE_IGB_PMD
- if ((ret = rte_igbvf_pmd_init()) != 0) {
- RTE_LOG(ERR, PMD, "Cannot init igbvf PMD\n");
- return (ret);
- }
-#endif /* RTE_LIBRTE_IGB_PMD */
-
#ifdef RTE_LIBRTE_EM_PMD
if ((ret = rte_em_pmd_init()) != 0) {
RTE_LOG(ERR, PMD, "Cannot init em PMD\n");
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index d5f2922..6cf7a03 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1325,15 +1325,6 @@ extern void rte_eth_driver_register(struct eth_driver *eth_drv);
extern int rte_em_pmd_init(void);
/**
- * The initialization function of the driver for 1Gbps Intel IGB_VF
- * Ethernet devices.
- * Invoked once at EAL start time.
- * @return
- * 0 on success
- */
-extern int rte_igbvf_pmd_init(void);
-
-/**
* The initialization function of the driver for 10Gbps Intel IXGBE
* Ethernet devices.
* Invoked once at EAL start time.
diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c
index df615e0..14e43b2 100644
--- a/lib/librte_pmd_e1000/igb_ethdev.c
+++ b/lib/librte_pmd_e1000/igb_ethdev.c
@@ -643,7 +643,7 @@ igb_vmdq_vlan_hw_filter_enable(struct rte_eth_dev *dev)
* Invoked one at EAL init time.
* Register itself as the [Virtual Poll Mode] Driver of PCI IGB devices.
*/
-int
+static int
rte_igbvf_pmd_init(void)
{
DEBUGFUNC("rte_igbvf_pmd_init");
@@ -2185,3 +2185,4 @@ eth_igb_rss_reta_query(struct rte_eth_dev *dev,
}
PMD_INIT(rte_igb_pmd_init);
+PMD_INIT(rte_igbvf_pmd_init);
--
1.8.3.1
More information about the dev
mailing list