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

Merge tag 'mlx5-updates-2019-09-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

Browse Source 
Saeed Mahameed says:

====================
mlx5-updates-2019-09-10

Misc build warnings cleanup for mlx5:

1) Reduce stack usage in FW trace
2) Fix addr's type in mlx5dr_icm_dm
3) Fix rt's type in dr_action_create_reformat_action
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2019-09-11 09:26:34 +01:00
parent 6d47b4bca4 fa355bb1b0
commit 747f3cf4bf
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
View File

@@ -553,9 +553,10 @@ static void mlx5_fw_tracer_save_trace(struct mlx5_fw_tracer *tracer,
mutex_unlock(&tracer->st_arr.lock); mutex_unlock(&tracer->st_arr.lock);
} }
static void mlx5_tracer_print_trace(struct tracer_string_format *str_frmt, static noinline
struct mlx5_core_dev *dev, void mlx5_tracer_print_trace(struct tracer_string_format *str_frmt,
u64 trace_timestamp) struct mlx5_core_dev *dev,
u64 trace_timestamp)
{ {
char tmp[512]; char tmp[512];

2
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c
View File

@@ -1074,7 +1074,7 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn,
case DR_ACTION_TYP_L2_TO_TNL_L2: case DR_ACTION_TYP_L2_TO_TNL_L2:
case DR_ACTION_TYP_L2_TO_TNL_L3: case DR_ACTION_TYP_L2_TO_TNL_L3:
{ {
enum mlx5dr_action_type rt; enum mlx5_reformat_ctx_type rt;
if (action->action_type == DR_ACTION_TYP_L2_TO_TNL_L2) if (action->action_type == DR_ACTION_TYP_L2_TO_TNL_L2)
rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL; rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;

2
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c
View File

@@ -53,7 +53,7 @@ struct mlx5dr_icm_pool {
struct mlx5dr_icm_dm { struct mlx5dr_icm_dm {
u32 obj_id; u32 obj_id;
enum mlx5_sw_icm_type type; enum mlx5_sw_icm_type type;
u64 addr; phys_addr_t addr;
size_t length; size_t length;
}; };