New upstream version 18.11.2

[deb_dpdk.git] / drivers / net / mlx4 / mlx4.c

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 7f07b8d..4bc966d 100644 (file)
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -81,7 +81,7 @@ static void mlx4_dev_stop(struct rte_eth_dev *dev);
 static int
 mlx4_dev_configure(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
        struct rte_flow_error error;
        int ret;
 
@@ -117,7 +117,7 @@ exit:
 static int
 mlx4_dev_start(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
        struct rte_flow_error error;
        int ret;
 
@@ -169,7 +169,7 @@ err:
 static void
 mlx4_dev_stop(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
 
        if (!priv->started)
                return;
@@ -194,7 +194,7 @@ mlx4_dev_stop(struct rte_eth_dev *dev)
 static void
 mlx4_dev_close(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx4_priv *priv = dev->data->dev_private;
        unsigned int i;
 
        DEBUG("%p: closing device \"%s\"",
@@ -599,7 +599,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                struct ibv_context *ctx = NULL;
                struct ibv_port_attr port_attr;
                struct ibv_pd *pd = NULL;
-               struct priv *priv = NULL;
+               struct mlx4_priv *priv = NULL;
                struct rte_eth_dev *eth_dev = NULL;
                struct ether_addr mac;
 
@@ -752,11 +752,11 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                 * handled by rte_intr_rx_ctl().
                 */
                eth_dev->intr_handle = &priv->intr_handle;
-               priv->dev = eth_dev;
+               priv->dev_data = eth_dev->data;
                eth_dev->dev_ops = &mlx4_dev_ops;
                /* Bring Ethernet device up. */
                DEBUG("forcing Ethernet interface up");
-               mlx4_dev_set_link_up(priv->dev);
+               mlx4_dev_set_link_up(eth_dev);
                /* Update link status once if waiting for LSC. */
                if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
                        mlx4_link_update(eth_dev, 0);