diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 1e2ab9d00f1c..296288c7cb37 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c | |||
@@ -2036,12 +2036,11 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
2036 | } | 2036 | } |
2037 | 2037 | ||
2038 | if (num_vfs) { | 2038 | if (num_vfs) { |
2039 | mlx4_warn(dev, "Enabling sriov with:%d vfs\n", num_vfs); | 2039 | mlx4_warn(dev, "Enabling SR-IOV with %d VFs\n", num_vfs); |
2040 | err = pci_enable_sriov(pdev, num_vfs); | 2040 | err = pci_enable_sriov(pdev, num_vfs); |
2041 | if (err) { | 2041 | if (err) { |
2042 | mlx4_err(dev, "Failed to enable sriov," | 2042 | mlx4_err(dev, "Failed to enable SR-IOV, continuing without SR-IOV (err = %d).\n", |
2043 | "continuing without sriov enabled" | 2043 | err); |
2044 | " (err = %d).\n", err); | ||
2045 | err = 0; | 2044 | err = 0; |
2046 | } else { | 2045 | } else { |
2047 | mlx4_warn(dev, "Running in master mode\n"); | 2046 | mlx4_warn(dev, "Running in master mode\n"); |
@@ -2284,7 +2283,7 @@ static void mlx4_remove_one(struct pci_dev *pdev) | |||
2284 | if (dev->flags & MLX4_FLAG_MSI_X) | 2283 | if (dev->flags & MLX4_FLAG_MSI_X) |
2285 | pci_disable_msix(pdev); | 2284 | pci_disable_msix(pdev); |
2286 | if (dev->flags & MLX4_FLAG_SRIOV) { | 2285 | if (dev->flags & MLX4_FLAG_SRIOV) { |
2287 | mlx4_warn(dev, "Disabling sriov\n"); | 2286 | mlx4_warn(dev, "Disabling SR-IOV\n"); |
2288 | pci_disable_sriov(pdev); | 2287 | pci_disable_sriov(pdev); |
2289 | } | 2288 | } |
2290 | 2289 | ||