Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / drivers / net / ethernet / mellanox / mlx4 / en_netdev.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index ac6a8f1eea6ca2dbaa94cce76cde89b85eda32c5..e075ff1f4e80a248f5480bd9e3f105f0ac6468be 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2458,7 +2458,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
        netif_set_real_num_tx_queues(dev, prof->tx_ring_num);
        netif_set_real_num_rx_queues(dev, prof->rx_ring_num);
 
-       SET_NETDEV_DEV(dev, &mdev->dev->pdev->dev);
+       SET_NETDEV_DEV(dev, &mdev->dev->persist->pdev->dev);
        dev->dev_port = port - 1;
 
        /*