diff options
| author |   yuval.shaia@oracle.com <yuval.shaia@oracle.com> | 2017-05-12 09:10:51 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-15 14:20:26 -0400 |
| commit | 4762010f09ac0453f613df345c5281e7f2dec510 (patch) | |
| tree | a976ac16558a93baa7fc7f9119a876bd6b761108 /drivers/net/ethernet/mellanox/mlx4/main.c | |
| parent | macvlan: Fix performance issues with vlan tagged packets (diff) | |
| download | wireguard-linux-4762010f09ac0453f613df345c5281e7f2dec510.tar.xz wireguard-linux-4762010f09ac0453f613df345c5281e7f2dec510.zip | |
net/mlx4_core: Use min3 to select number of MSI-X vectors
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 703205475524..83aab1e4c8c8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -2862,12 +2862,10 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) int port = 0; if (msi_x) { - int nreq = dev->caps.num_ports * num_online_cpus() + 1; - - nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs, - nreq); - if (nreq > MAX_MSIX) - nreq = MAX_MSIX; + int nreq = min3(dev->caps.num_ports * + (int)num_online_cpus() + 1, + dev->caps.num_eqs - dev->caps.reserved_eqs, + MAX_MSIX); entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL); if (!entries) |