net/mlx5: Reduce useless indirection in IPsec FS add/delete flows

There is no need in one-liners wrappers to call internal functions.
Let's remove them.

Reviewed-by: Raed Salem <raeds@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
index b04d5de..251178e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -271,21 +271,6 @@ static inline int mlx5e_xfrm_validate_state(struct xfrm_state *x)
        return 0;
 }
 
-static int mlx5e_xfrm_fs_add_rule(struct mlx5e_priv *priv,
-                                 struct mlx5e_ipsec_sa_entry *sa_entry)
-{
-       return mlx5e_accel_ipsec_fs_add_rule(priv, &sa_entry->xfrm->attrs,
-                                            sa_entry->ipsec_obj_id,
-                                            &sa_entry->ipsec_rule);
-}
-
-static void mlx5e_xfrm_fs_del_rule(struct mlx5e_priv *priv,
-                                  struct mlx5e_ipsec_sa_entry *sa_entry)
-{
-       mlx5e_accel_ipsec_fs_del_rule(priv, &sa_entry->xfrm->attrs,
-                                     &sa_entry->ipsec_rule);
-}
-
 static int mlx5e_xfrm_add_state(struct xfrm_state *x)
 {
        struct mlx5e_ipsec_sa_entry *sa_entry = NULL;
@@ -334,7 +319,9 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x)
        }
 
        sa_entry->ipsec_obj_id = sa_handle;
-       err = mlx5e_xfrm_fs_add_rule(priv, sa_entry);
+       err = mlx5e_accel_ipsec_fs_add_rule(priv, &sa_entry->xfrm->attrs,
+                                           sa_entry->ipsec_obj_id,
+                                           &sa_entry->ipsec_rule);
        if (err)
                goto err_hw_ctx;
 
@@ -351,7 +338,8 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x)
        goto out;
 
 err_add_rule:
-       mlx5e_xfrm_fs_del_rule(priv, sa_entry);
+       mlx5e_accel_ipsec_fs_del_rule(priv, &sa_entry->xfrm->attrs,
+                                     &sa_entry->ipsec_rule);
 err_hw_ctx:
        mlx5_accel_esp_free_hw_context(priv->mdev, sa_entry->hw_context);
 err_xfrm:
@@ -378,7 +366,8 @@ static void mlx5e_xfrm_free_state(struct xfrm_state *x)
 
        if (sa_entry->hw_context) {
                flush_workqueue(sa_entry->ipsec->wq);
-               mlx5e_xfrm_fs_del_rule(priv, sa_entry);
+               mlx5e_accel_ipsec_fs_del_rule(priv, &sa_entry->xfrm->attrs,
+                                             &sa_entry->ipsec_rule);
                mlx5_accel_esp_free_hw_context(sa_entry->xfrm->mdev, sa_entry->hw_context);
                mlx5_accel_esp_destroy_xfrm(sa_entry->xfrm);
        }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
index f733a6e..bffad18 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
@@ -612,8 +612,8 @@ int mlx5e_accel_ipsec_fs_add_rule(struct mlx5e_priv *priv,
 }
 
 void mlx5e_accel_ipsec_fs_del_rule(struct mlx5e_priv *priv,
-                                  struct mlx5_accel_esp_xfrm_attrs *attrs,
-                                  struct mlx5e_ipsec_rule *ipsec_rule)
+                            struct mlx5_accel_esp_xfrm_attrs *attrs,
+                            struct mlx5e_ipsec_rule *ipsec_rule)
 {
        if (attrs->action == MLX5_ACCEL_ESP_ACTION_DECRYPT)
                rx_del_rule(priv, attrs, ipsec_rule);