lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1494492389-15040-1-git-send-email-yuval.shaia@oracle.com> Date: Thu, 11 May 2017 11:46:29 +0300 From: Yuval Shaia <yuval.shaia@...cle.com> To: yishaih@...lanox.com, netdev@...r.kernel.org, linux-rdma@...r.kernel.org Subject: [PATCH v1] net/mlx4_core: Use min_t instead of if for consistency Signed-off-by: Yuval Shaia <yuval.shaia@...cle.com> --- v0 -> v1: * s/"min_t("/"min_t(int" --- drivers/net/ethernet/mellanox/mlx4/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 7032054..7bb377e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -2862,12 +2862,11 @@ 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; + int nreq = min_t(int, + dev->caps.num_ports * num_online_cpus() + 1, + dev->caps.num_eqs - dev->caps.reserved_eqs); - nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs, - nreq); - if (nreq > MAX_MSIX) - nreq = MAX_MSIX; + nreq = min_t(int, nreq, MAX_MSIX); entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL); if (!entries) -- 2.7.4
Powered by blists - more mailing lists