Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06293ae4 authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5e: Change naming convention for reporter's functions 



Change from mlx5e_tx_reporter_* to mlx5e_reporter_tx_*. In the following
patches in the set rx reporter is added, the new naming convention is
more uniformed.

Signed-off-by: default avatarAya Levin <ayal@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 4edc17fd

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

+4 −4
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 


#include "en.h"



int mlx5e_tx_reporter_create(struct mlx5e_priv *priv);

void mlx5e_tx_reporter_destroy(struct mlx5e_priv *priv);

void mlx5e_tx_reporter_err_cqe(struct mlx5e_txqsq *sq);

int mlx5e_tx_reporter_timeout(struct mlx5e_txqsq *sq);

int mlx5e_reporter_tx_create(struct mlx5e_priv *priv);

void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv);

void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq);

int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq);



#endif

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

+4 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int mlx5_tx_health_report(struct devlink_health_reporter *tx_reporter, 
	return devlink_health_report(tx_reporter, err_str, err_ctx);

}



void mlx5e_tx_reporter_err_cqe(struct mlx5e_txqsq *sq)

void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq)

{

	char err_str[MLX5E_TX_REPORTER_PER_SQ_MAX_LEN];

	struct mlx5e_tx_err_ctx err_ctx = {0};
@@ -156,7 +156,7 @@ static int mlx5e_tx_reporter_timeout_recover(struct mlx5e_txqsq *sq) 
	return 0;

}



int mlx5e_tx_reporter_timeout(struct mlx5e_txqsq *sq)

int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq)

{

	char err_str[MLX5E_TX_REPORTER_PER_SQ_MAX_LEN];

	struct mlx5e_tx_err_ctx err_ctx;
@@ -285,7 +285,7 @@ static const struct devlink_health_reporter_ops mlx5_tx_reporter_ops = { 


#define MLX5_REPORTER_TX_GRACEFUL_PERIOD 500



int mlx5e_tx_reporter_create(struct mlx5e_priv *priv)

int mlx5e_reporter_tx_create(struct mlx5e_priv *priv)

{

	struct devlink_health_reporter *reporter;

	struct mlx5_core_dev *mdev = priv->mdev;
@@ -305,7 +305,7 @@ int mlx5e_tx_reporter_create(struct mlx5e_priv *priv) 
	return 0;

}



void mlx5e_tx_reporter_destroy(struct mlx5e_priv *priv)

void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv)

{

	if (!priv->tx_reporter)

		return;

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1379,7 +1379,7 @@ static void mlx5e_tx_err_cqe_work(struct work_struct *recover_work) 
	struct mlx5e_txqsq *sq = container_of(recover_work, struct mlx5e_txqsq,

					      recover_work);



	mlx5e_tx_reporter_err_cqe(sq);

	mlx5e_reporter_tx_err_cqe(sq);

}



int mlx5e_open_icosq(struct mlx5e_channel *c, struct mlx5e_params *params,
@@ -3201,7 +3201,7 @@ static void mlx5e_cleanup_nic_tx(struct mlx5e_priv *priv) 
{

	int tc;



	mlx5e_tx_reporter_destroy(priv);

	mlx5e_reporter_tx_destroy(priv);

	for (tc = 0; tc < priv->profile->max_tc; tc++)

		mlx5e_destroy_tis(priv->mdev, priv->tisn[tc]);

}
@@ -4271,7 +4271,7 @@ static void mlx5e_tx_timeout_work(struct work_struct *work) 
		if (!netif_xmit_stopped(dev_queue))

			continue;



		if (mlx5e_tx_reporter_timeout(sq))

		if (mlx5e_reporter_tx_timeout(sq))

			report_failed = true;

	}
@@ -5077,7 +5077,7 @@ static int mlx5e_init_nic_tx(struct mlx5e_priv *priv) 
#ifdef CONFIG_MLX5_CORE_EN_DCB

	mlx5e_dcbnl_initialize(priv);

#endif

	mlx5e_tx_reporter_create(priv);

	mlx5e_reporter_tx_create(priv);

	return 0;

}