Skip to content

Commit 4762010

Browse files
yuval.shaia@oracle.comdavem330
authored andcommitted
net/mlx4_core: Use min3 to select number of MSI-X vectors
Signed-off-by: Yuval Shaia <[email protected]> Reviewed-by: Leon Romanovsky <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 70957ea commit 4762010

File tree

1 file changed

+4
-6
lines changed
  • drivers/net/ethernet/mellanox/mlx4

1 file changed

+4
-6
lines changed

drivers/net/ethernet/mellanox/mlx4/main.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,12 +2862,10 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
28622862
int port = 0;
28632863

28642864
if (msi_x) {
2865-
int nreq = dev->caps.num_ports * num_online_cpus() + 1;
2866-
2867-
nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
2868-
nreq);
2869-
if (nreq > MAX_MSIX)
2870-
nreq = MAX_MSIX;
2865+
int nreq = min3(dev->caps.num_ports *
2866+
(int)num_online_cpus() + 1,
2867+
dev->caps.num_eqs - dev->caps.reserved_eqs,
2868+
MAX_MSIX);
28712869

28722870
entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
28732871
if (!entries)

0 commit comments

Comments
 (0)