leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/mlx5e: Drop priv argument of ptp function in en_fs

Browse Source 
Both mlx5e_ptp_alloc_rx_fs and mlx5e_ptp_free_rx_fs only
make use of two priv member, pass them directly instead.
This will help dropping priv from all en_fs file.

Signed-off-by: Lama Kayal <lkayal@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
This commit is contained in:
Lama Kayal 2022-01-31 22:13:41 +02:00 committed by Saeed Mahameed
parent 1be44b42b2
commit 81a0b241af
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
View File

@ -622,12 +622,10 @@ static int mlx5e_ptp_set_state(struct mlx5e_ptp *c, struct mlx5e_params *params)
return bitmap_empty(c->state, MLX5E_PTP_STATE_NUM_STATES) ? -EINVAL : 0;
}
static void mlx5e_ptp_rx_unset_fs(struct mlx5e_priv *priv)
static void mlx5e_ptp_rx_unset_fs(struct mlx5e_flow_steering *fs)
{
struct mlx5e_flow_steering *fs = priv->fs;
struct mlx5e_ptp_fs *ptp_fs;
struct mlx5e_ptp_fs *ptp_fs = mlx5e_fs_get_ptp(fs);
ptp_fs = mlx5e_fs_get_ptp(fs);
if (!ptp_fs->valid)
return;
@ -801,29 +799,31 @@ int mlx5e_ptp_get_rqn(struct mlx5e_ptp *c, u32 *rqn)
return 0;
}
int mlx5e_ptp_alloc_rx_fs(struct mlx5e_priv *priv)
int mlx5e_ptp_alloc_rx_fs(struct mlx5e_flow_steering *fs,
const struct mlx5e_profile *profile)
{
struct mlx5e_ptp_fs *ptp_fs;
if (!mlx5e_profile_feature_cap(priv->profile, PTP_RX))
if (!mlx5e_profile_feature_cap(profile, PTP_RX))
return 0;
ptp_fs = kzalloc(sizeof(*ptp_fs), GFP_KERNEL);
if (!ptp_fs)
return -ENOMEM;
mlx5e_fs_set_ptp(priv->fs, ptp_fs);
mlx5e_fs_set_ptp(fs, ptp_fs);
return 0;
}
void mlx5e_ptp_free_rx_fs(struct mlx5e_priv *priv)
void mlx5e_ptp_free_rx_fs(struct mlx5e_flow_steering *fs,
const struct mlx5e_profile *profile)
{
struct mlx5e_ptp_fs *ptp_fs = mlx5e_fs_get_ptp(priv->fs);
struct mlx5e_ptp_fs *ptp_fs = mlx5e_fs_get_ptp(fs);
if (!mlx5e_profile_feature_cap(priv->profile, PTP_RX))
if (!mlx5e_profile_feature_cap(profile, PTP_RX))
return;
mlx5e_ptp_rx_unset_fs(priv);
mlx5e_ptp_rx_unset_fs(fs);
kfree(ptp_fs);
}
@ -849,6 +849,6 @@ int mlx5e_ptp_rx_manage_fs(struct mlx5e_priv *priv, bool set)
netdev_WARN_ONCE(priv->netdev, "Don't try to remove PTP RX-FS rules");
return -EINVAL;
}
mlx5e_ptp_rx_unset_fs(priv);
mlx5e_ptp_rx_unset_fs(priv->fs);
return 0;
}

6
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h
View File

@ -74,8 +74,10 @@ void mlx5e_ptp_close(struct mlx5e_ptp *c);
void mlx5e_ptp_activate_channel(struct mlx5e_ptp *c);
void mlx5e_ptp_deactivate_channel(struct mlx5e_ptp *c);
int mlx5e_ptp_get_rqn(struct mlx5e_ptp *c, u32 *rqn);
int mlx5e_ptp_alloc_rx_fs(struct mlx5e_priv *priv);
void mlx5e_ptp_free_rx_fs(struct mlx5e_priv *priv);
int mlx5e_ptp_alloc_rx_fs(struct mlx5e_flow_steering *fs,
const struct mlx5e_profile *profile);
void mlx5e_ptp_free_rx_fs(struct mlx5e_flow_steering *fs,
const struct mlx5e_profile *profile);
int mlx5e_ptp_rx_manage_fs(struct mlx5e_priv *priv, bool set);
enum {

4
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
View File

@ -1338,7 +1338,7 @@ int mlx5e_create_flow_steering(struct mlx5e_priv *priv)
goto err_destroy_l2_table;
}
err = mlx5e_ptp_alloc_rx_fs(priv);
err = mlx5e_ptp_alloc_rx_fs(priv->fs, priv->profile);
if (err)
goto err_destory_vlan_table;
@ -1362,7 +1362,7 @@ err_destroy_arfs_tables:
void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv)
{
mlx5e_ptp_free_rx_fs(priv);
mlx5e_ptp_free_rx_fs(priv->fs, priv->profile);
mlx5e_destroy_vlan_table(priv);
mlx5e_destroy_l2_table(priv);
mlx5e_destroy_ttc_table(priv);