igb: convert to use of PMD_REGISTER_DRIVER and fix linking

[dpdk.git] / lib / librte_ether / rte_ethdev.h

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 1ac4c5c..a6dd769 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -787,6 +787,8 @@ struct rte_eth_conf {
 struct rte_eth_dev_info {
        struct rte_pci_device *pci_dev; /**< Device PCI information. */
        const char *driver_name; /**< Device Driver name. */
+       unsigned int if_index; /**< Index to bound host interface, or 0 if none.
+               Use if_indextoname() to translate into an interface name. */
        uint32_t min_rx_bufsize; /**< Minimum size of RX buffer. */
        uint32_t max_rx_pktlen; /**< Maximum configurable length of RX pkt. */
        uint16_t max_rx_queues; /**< Maximum number of RX queues. */
@@ -1313,24 +1315,6 @@ struct eth_driver {
  */
 extern void rte_eth_driver_register(struct eth_driver *eth_drv);
 
-/**
- * The initialization function of the driver for
- * Intel(r) IGB Gigabit Ethernet Controller devices.
- * This function is invoked once at EAL start time.
- * @return
- *   0 on success
- */
-extern int rte_igb_pmd_init(void);
-
-/**
- * The initialization function of the driver for
- * Intel(r) EM Gigabit Ethernet Controller devices.
- * This function is invoked once at EAL start time.
- * @return
- *   0 on success
- */
-extern int rte_em_pmd_init(void);
-
 /**
  * The initialization function of the driver for 1Gbps Intel IGB_VF
  * Ethernet devices.
@@ -1400,23 +1384,12 @@ int rte_pmd_init_all(void)
        int ret = -ENODEV;
 
 #ifdef RTE_LIBRTE_IGB_PMD
-       if ((ret = rte_igb_pmd_init()) != 0) {
-               RTE_LOG(ERR, PMD, "Cannot init igb PMD\n");
-               return (ret);
-       }
        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");
-               return (ret);
-       }
-#endif /* RTE_LIBRTE_EM_PMD */
-
 #ifdef RTE_LIBRTE_IXGBE_PMD
        if ((ret = rte_ixgbe_pmd_init()) != 0) {
                RTE_LOG(ERR, PMD, "Cannot init ixgbe PMD\n");