Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 02:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/mlx5: Align ODP capability function with netdev coding style

Browse Source 
Update newly introduced function to be aligned to netdev coding style.

Fixes: 46861e3e88 ("net/mlx5: Set ODP SRQ support in firmware")
Reported-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
This commit is contained in:
Leon Romanovsky 2019-02-11 13:56:07 +02:00
parent 1fbf1252df
commit 224d71ccc0
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/mellanox/mlx5/core/main.c
View File

@ -461,9 +461,9 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev *dev)
static int handle_hca_cap_odp(struct mlx5_core_dev *dev) static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
{ {
void *set_ctx;
void *set_hca_cap; void *set_hca_cap;
int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in); void *set_ctx;
int set_sz;
int err; int err;
if (!MLX5_CAP_GEN(dev, pg)) if (!MLX5_CAP_GEN(dev, pg))
@ -473,15 +473,12 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
if (err) if (err)
return err; return err;
/**
* If all bits are cleared we shouldn't try to set it
* or we might fail while trying to access a reserved bit.
*/
if (!(MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive) || if (!(MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive) ||
MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive) || MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive) ||
MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive))) MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive)))
return 0; return 0;
set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
set_ctx = kzalloc(set_sz, GFP_KERNEL); set_ctx = kzalloc(set_sz, GFP_KERNEL);
if (!set_ctx) if (!set_ctx)
return -ENOMEM; return -ENOMEM;
@ -492,13 +489,13 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
/* set ODP SRQ support for RC/UD and XRC transports */ /* set ODP SRQ support for RC/UD and XRC transports */
MLX5_SET(odp_cap, set_hca_cap, ud_odp_caps.srq_receive, MLX5_SET(odp_cap, set_hca_cap, ud_odp_caps.srq_receive,
(MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive))); MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive));
MLX5_SET(odp_cap, set_hca_cap, rc_odp_caps.srq_receive, MLX5_SET(odp_cap, set_hca_cap, rc_odp_caps.srq_receive,
(MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive))); MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive));
MLX5_SET(odp_cap, set_hca_cap, xrc_odp_caps.srq_receive, MLX5_SET(odp_cap, set_hca_cap, xrc_odp_caps.srq_receive,
(MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive))); MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive));
err = set_caps(dev, set_ctx, set_sz, MLX5_SET_HCA_CAP_OP_MOD_ODP); err = set_caps(dev, set_ctx, set_sz, MLX5_SET_HCA_CAP_OP_MOD_ODP);