drivers/net: add generic ethdev macro to get PCI device

[dpdk.git] / drivers / net / liquidio / lio_ethdev.c

diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c
index 4edb0d1..6fce88f 100644 (file)
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -937,6 +937,9 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev,
        case LIO_LINK_SPEED_10000:
                link.link_speed = ETH_SPEED_NUM_10G;
                break;
+       case LIO_LINK_SPEED_25000:
+               link.link_speed = ETH_SPEED_NUM_25G;
+               break;
        default:
                link.link_speed = ETH_SPEED_NUM_NONE;
                link.link_duplex = ETH_LINK_HALF_DUPLEX;
@@ -1156,14 +1159,13 @@ void
 lio_dev_rx_queue_release(void *rxq)
 {
        struct lio_droq *droq = rxq;
-       struct lio_device *lio_dev = droq->lio_dev;
        int oq_no;
 
-       /* Run time queue deletion not supported */
-       if (lio_dev->port_configured)
-               return;
+       if (droq) {
+               /* Run time queue deletion not supported */
+               if (droq->lio_dev->port_configured)
+                       return;
 
-       if (droq != NULL) {
                oq_no = droq->q_no;
                lio_delete_droq_queue(droq->lio_dev, oq_no);
        }
@@ -1251,14 +1253,14 @@ void
 lio_dev_tx_queue_release(void *txq)
 {
        struct lio_instr_queue *tq = txq;
-       struct lio_device *lio_dev = tq->lio_dev;
        uint32_t fw_mapped_iq_no;
 
-       /* Run time queue deletion not supported */
-       if (lio_dev->port_configured)
-               return;
 
-       if (tq != NULL) {
+       if (tq) {
+               /* Run time queue deletion not supported */
+               if (tq->lio_dev->port_configured)
+                       return;
+
                /* Free sg_list */
                lio_delete_sglist(tq);
 
@@ -1956,7 +1958,7 @@ lio_eth_dev_uninit(struct rte_eth_dev *eth_dev)
 static int
 lio_eth_dev_init(struct rte_eth_dev *eth_dev)
 {
-       struct rte_pci_device *pdev = RTE_DEV_TO_PCI(eth_dev->device);
+       struct rte_pci_device *pdev = RTE_ETH_DEV_TO_PCI(eth_dev);
        struct lio_device *lio_dev = LIO_DEV(eth_dev);
 
        PMD_INIT_FUNC_TRACE();
@@ -2053,4 +2055,4 @@ static struct rte_pci_driver rte_liovf_pmd = {
 
 RTE_PMD_REGISTER_PCI(net_liovf, rte_liovf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_liovf, pci_id_liovf_map);
-RTE_PMD_REGISTER_KMOD_DEP(net_liovf, "* igb_uio | vfio");
+RTE_PMD_REGISTER_KMOD_DEP(net_liovf, "* igb_uio | vfio-pci");