hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Aya Levin <ayal@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
Aya Levin 2019-07-01 15:51:51 +03:00 committed by Saeed Mahameed
parent 4edc17fdfd
commit 06293ae4fa
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/mellanox/mlx5/core/en/health.h
View File

@ -6,9 +6,9 @@
#include "en.h" #include "en.h"
int mlx5e_tx_reporter_create(struct mlx5e_priv *priv); int mlx5e_reporter_tx_create(struct mlx5e_priv *priv);
void mlx5e_tx_reporter_destroy(struct mlx5e_priv *priv); void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv);
void mlx5e_tx_reporter_err_cqe(struct mlx5e_txqsq *sq); void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq);
int mlx5e_tx_reporter_timeout(struct mlx5e_txqsq *sq); int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq);
#endif #endif

8
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
View File

@ -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); 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]; char err_str[MLX5E_TX_REPORTER_PER_SQ_MAX_LEN];
struct mlx5e_tx_err_ctx err_ctx = {0}; 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; 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]; char err_str[MLX5E_TX_REPORTER_PER_SQ_MAX_LEN];
struct mlx5e_tx_err_ctx err_ctx; 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 #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 devlink_health_reporter *reporter;
struct mlx5_core_dev *mdev = priv->mdev; struct mlx5_core_dev *mdev = priv->mdev;
@ -305,7 +305,7 @@ int mlx5e_tx_reporter_create(struct mlx5e_priv *priv)
return 0; return 0;
} }
void mlx5e_tx_reporter_destroy(struct mlx5e_priv *priv) void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv)
{ {
if (!priv->tx_reporter) if (!priv->tx_reporter)
return; return;

8
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View File

@ -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, struct mlx5e_txqsq *sq = container_of(recover_work, struct mlx5e_txqsq,
recover_work); 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, 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; int tc;
mlx5e_tx_reporter_destroy(priv); mlx5e_reporter_tx_destroy(priv);
for (tc = 0; tc < priv->profile->max_tc; tc++) for (tc = 0; tc < priv->profile->max_tc; tc++)
mlx5e_destroy_tis(priv->mdev, priv->tisn[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)) if (!netif_xmit_stopped(dev_queue))
continue; continue;
if (mlx5e_tx_reporter_timeout(sq)) if (mlx5e_reporter_tx_timeout(sq))
report_failed = true; report_failed = true;
} }
@ -5077,7 +5077,7 @@ static int mlx5e_init_nic_tx(struct mlx5e_priv *priv)
#ifdef CONFIG_MLX5_CORE_EN_DCB #ifdef CONFIG_MLX5_CORE_EN_DCB
mlx5e_dcbnl_initialize(priv); mlx5e_dcbnl_initialize(priv);
#endif #endif
mlx5e_tx_reporter_create(priv); mlx5e_reporter_tx_create(priv);
return 0; return 0;
} }