diff options
| author |   Yevgeny Petrilin <yevgenyp@mellanox.co.il> | 2012-06-25 00:24:12 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-06-25 16:30:12 -0700 |
| commit | 9858d2d1acf82758f779e0756d92a011f1d170b3 (patch) | |
| tree | b1173c984ca85fe742f71dbe61f1db8df3b9aa5f | |
| parent | net/mlx4_en: Set correct port parameters during device initialization (diff) | |
| download | linux-dev-9858d2d1acf82758f779e0756d92a011f1d170b3.tar.xz linux-dev-9858d2d1acf82758f779e0756d92a011f1d170b3.zip | |
net/mlx4: Use single completion vector after NOP failure
Fix a crash at the error flow of NOP command which caused the driver to try and use
a completion vector which wasn't allocated.
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index ee6f4fe00837..a0313de122de 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -1975,6 +1975,8 @@ slave_start: if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X) && !mlx4_is_mfunc(dev)) { dev->flags &= ~MLX4_FLAG_MSI_X; + dev->caps.num_comp_vectors = 1; + dev->caps.comp_pool = 0; pci_disable_msix(pdev); err = mlx4_setup_hca(dev); } |