Commit a534e24d authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Saeed Mahameed
Browse files

net/mlx5: Remove indirections from esp functions 



This change cleanups the mlx5 esp interface.

Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent c6e3b421

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c

+12 −35
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ u32 mlx5_ipsec_device_caps(struct mlx5_core_dev *mdev) 
}

EXPORT_SYMBOL_GPL(mlx5_ipsec_device_caps);



static struct mlx5_accel_esp_xfrm *

mlx5_ipsec_offload_esp_create_xfrm(struct mlx5_core_dev *mdev,

struct mlx5_accel_esp_xfrm *

mlx5_accel_esp_create_xfrm(struct mlx5_core_dev *mdev,

			   const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	struct mlx5_ipsec_esp_xfrm *mxfrm;
@@ -74,10 +74,11 @@ mlx5_ipsec_offload_esp_create_xfrm(struct mlx5_core_dev *mdev, 
	memcpy(&mxfrm->accel_xfrm.attrs, attrs,

	       sizeof(mxfrm->accel_xfrm.attrs));



	mxfrm->accel_xfrm.mdev = mdev;

	return &mxfrm->accel_xfrm;

}



static void mlx5_ipsec_offload_esp_destroy_xfrm(struct mlx5_accel_esp_xfrm *xfrm)

void mlx5_accel_esp_destroy_xfrm(struct mlx5_accel_esp_xfrm *xfrm)

{

	struct mlx5_ipsec_esp_xfrm *mxfrm = container_of(xfrm, struct mlx5_ipsec_esp_xfrm,

							 accel_xfrm);
@@ -275,14 +276,13 @@ static int mlx5_modify_ipsec_obj(struct mlx5_core_dev *mdev, 
	return mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));

}



static void mlx5_ipsec_offload_esp_modify_xfrm(

	struct mlx5_accel_esp_xfrm *xfrm,

void mlx5_accel_esp_modify_xfrm(struct mlx5_accel_esp_xfrm *xfrm,

				const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	struct mlx5_ipsec_obj_attrs ipsec_attrs = {};

	struct mlx5_core_dev *mdev = xfrm->mdev;

	struct mlx5_ipsec_esp_xfrm *mxfrm;

	int err = 0;

	int err;



	mxfrm = container_of(xfrm, struct mlx5_ipsec_esp_xfrm, accel_xfrm);
@@ -294,7 +294,9 @@ static void mlx5_ipsec_offload_esp_modify_xfrm( 
				    &ipsec_attrs,

				    mxfrm->sa_ctx->ipsec_obj_id);



	if (!err)

	if (err)

		return;



	memcpy(&xfrm->attrs, attrs, sizeof(xfrm->attrs));

}
@@ -321,28 +323,3 @@ void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev, void *context) 
{

	mlx5_ipsec_offload_delete_sa_ctx(context);

}
 


struct mlx5_accel_esp_xfrm *

mlx5_accel_esp_create_xfrm(struct mlx5_core_dev *mdev,

			   const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	struct mlx5_accel_esp_xfrm *xfrm;



	xfrm = mlx5_ipsec_offload_esp_create_xfrm(mdev, attrs);

	if (IS_ERR(xfrm))

		return xfrm;



	xfrm->mdev = mdev;

	return xfrm;

}



void mlx5_accel_esp_destroy_xfrm(struct mlx5_accel_esp_xfrm *xfrm)

{

	mlx5_ipsec_offload_esp_destroy_xfrm(xfrm);

}



void mlx5_accel_esp_modify_xfrm(struct mlx5_accel_esp_xfrm *xfrm,

				const struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	mlx5_ipsec_offload_esp_modify_xfrm(xfrm, attrs);

}