summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHaggai Abramonvsky <hagaya@mellanox.com>2015-06-04 18:30:39 +0200
committerDavid S. Miller <davem@davemloft.net>2015-06-05 01:41:01 +0200
commite74a1db03326ecdc7c3f54a581b197a26ce5eebe (patch)
tree6d3b41f262d654bad5ba41b1d01af3538ab58b87 /drivers
parentnet/mlx5_core: Enable XRCs and SRQs when using ISSI > 0 (diff)
downloadlinux-e74a1db03326ecdc7c3f54a581b197a26ce5eebe.tar.xz
linux-e74a1db03326ecdc7c3f54a581b197a26ce5eebe.zip
net/mlx5_core: Check the return bitmask when querying ISSI
The determination of the supported ISSI versions should be conditioned on the returned mask, and not only on the return status of the query ISSI command, fix that. Signed-off-by: Haggai Abramovsky <hagaya@mellanox.com> Signed-off-by: Majd Dibbiny <majd@mellanox.com> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 2510fed3494d..11c7216a2517 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -654,7 +654,7 @@ static int mlx5_core_set_issi(struct mlx5_core_dev *dev)
dev->issi = 1;
return 0;
- } else if (sup_issi & (1 << 0)) {
+ } else if (sup_issi & (1 << 0) || !sup_issi) {
return 0;
}