diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-17 22:28:53 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-17 22:28:53 (GMT) |
commit | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (patch) | |
tree | bd43db7f86cd23af0c3905ff8ff991f910eba5e0 /drivers/net | |
parent | 0bac038a9eec00ac27f95ca0360954c0016fd859 (diff) | |
parent | ac8581d408d41ebd5583b4e85b18e7ef16bb044b (diff) | |
download | linux-fsl-qoriq-f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Use consistent types for ehca_plpar_hcall9()
IB/ehca: Fix printk format warnings from u64 type change
IPoIB: Do not print error messages for multicast join retries
IB/mlx4: Fix memory ordering problem when posting LSO sends
mlx4_core: Fix min() warning
IPoIB: Fix deadlock between ipoib_open() and child interface create
IPoIB: Fix hang in napi_disable() if P_Key is never found
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/mlx4/profile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/mlx4/profile.c index 919fb9e..cebdf32 100644 --- a/drivers/net/mlx4/profile.c +++ b/drivers/net/mlx4/profile.c @@ -107,9 +107,9 @@ u64 mlx4_make_profile(struct mlx4_dev *dev, profile[MLX4_RES_AUXC].num = request->num_qp; profile[MLX4_RES_SRQ].num = request->num_srq; profile[MLX4_RES_CQ].num = request->num_cq; - profile[MLX4_RES_EQ].num = min(dev_cap->max_eqs, - dev_cap->reserved_eqs + - num_possible_cpus() + 1); + profile[MLX4_RES_EQ].num = min_t(unsigned, dev_cap->max_eqs, + dev_cap->reserved_eqs + + num_possible_cpus() + 1); profile[MLX4_RES_DMPT].num = request->num_mpt; profile[MLX4_RES_CMPT].num = MLX4_NUM_CMPTS; profile[MLX4_RES_MTT].num = request->num_mtt; |