Commit 7ea4376b authored by Carolina Jubran's avatar Carolina Jubran Committed by Jakub Kicinski
Browse files

net/mlx5e: Remove redundant tstamp pointer from channel structures 



Remove the tstamp pointer field from mlx5e_channel, mlx5e_ptp, and
mlx5e_trap structures, since it was only used to reference the tstamp
field in the priv structure. Instead, directly use the tstamp field
from priv when initializing RQ structures.

Also remove the unused hwtstamp_config field from mlx5_clock structure
as part of the cleanup.

Signed-off-by: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1761819910-1011051-2-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 54133f9b

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −1
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ struct mlx5e_channel { 
	/* control */

	struct mlx5e_priv         *priv;

	struct mlx5_core_dev      *mdev;

	struct hwtstamp_config    *tstamp;

	DECLARE_BITMAP(state, MLX5E_CHANNEL_NUM_STATES);

	int                        ix;

	int                        vec_ix;

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c

+0 −1
Original line number Diff line number Diff line
@@ -896,7 +896,6 @@ int mlx5e_ptp_open(struct mlx5e_priv *priv, struct mlx5e_params *params, 


	c->priv     = priv;

	c->mdev     = priv->mdev;

	c->tstamp   = &priv->tstamp;

	c->pdev     = mlx5_core_dma_dev(priv->mdev);

	c->netdev   = priv->netdev;

	c->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.hw_objs.mkey);

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ struct mlx5e_ptp { 
	/* control */

	struct mlx5e_priv         *priv;

	struct mlx5_core_dev      *mdev;

	struct hwtstamp_config    *tstamp;

	DECLARE_BITMAP(state, MLX5E_PTP_STATE_NUM_STATES);

	struct mlx5_sq_bfreg      *bfreg;

};

drivers/net/ethernet/mellanox/mlx5/core/en/trap.c

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static struct mlx5e_trap *mlx5e_open_trap(struct mlx5e_priv *priv) 


	t->priv     = priv;

	t->mdev     = priv->mdev;

	t->tstamp   = &priv->tstamp;

	t->pdev     = mlx5_core_dma_dev(priv->mdev);

	t->netdev   = priv->netdev;

	t->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.hw_objs.mkey);

drivers/net/ethernet/mellanox/mlx5/core/en/trap.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ struct mlx5e_trap { 
	/* control */

	struct mlx5e_priv         *priv;

	struct mlx5_core_dev      *mdev;

	struct hwtstamp_config    *tstamp;

	DECLARE_BITMAP(state, MLX5E_CHANNEL_NUM_STATES);



	struct mlx5e_params        params;