From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) by dpdk.org (Postfix) with ESMTP id 4530968BE for ; Thu, 10 Apr 2014 22:49:32 +0200 (CEST) Received: from hmsreliant.think-freely.org ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1WYLwA-0004Py-22; Thu, 10 Apr 2014 16:51:09 -0400 From: Neil Horman To: dev@dpdk.org Date: Thu, 10 Apr 2014 16:50:04 -0400 Message-Id: <1397163009-29950-14-git-send-email-nhorman@tuxdriver.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1397163009-29950-1-git-send-email-nhorman@tuxdriver.com> References: <1397162846-28912-1-git-send-email-nhorman@tuxdriver.com> <1397163009-29950-1-git-send-email-nhorman@tuxdriver.com> X-Spam-Score: -2.9 (--) X-Spam-Status: No Subject: [dpdk-dev] [PATCH 14/19] igbvf: move igbvf pmd to use PMD_INIT macro X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 20:49:32 -0000 Removed references to core library so that it can be linked in whenever needed Signed-off-by: Neil Horman --- 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