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

Commit 747f3cf4 authored by David S. Miller's avatar David S. Miller
Browse files

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



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: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d47b4bc fa355bb1

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+4 −3
Original line number Diff line number Diff line
@@ -553,7 +553,8 @@ static void mlx5_fw_tracer_save_trace(struct mlx5_fw_tracer *tracer, 
	mutex_unlock(&tracer->st_arr.lock);

}



static void mlx5_tracer_print_trace(struct tracer_string_format *str_frmt,

static noinline

void mlx5_tracer_print_trace(struct tracer_string_format *str_frmt,

			     struct mlx5_core_dev *dev,

			     u64 trace_timestamp)

{

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c

+1 −1
Original line number Diff line number Diff line
@@ -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_L3:

	{

		enum mlx5dr_action_type rt;

		enum mlx5_reformat_ctx_type rt;



		if (action->action_type == DR_ACTION_TYP_L2_TO_TNL_L2)

			rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct mlx5dr_icm_pool { 
struct mlx5dr_icm_dm {

	u32 obj_id;

	enum mlx5_sw_icm_type type;

	u64 addr;

	phys_addr_t addr;

	size_t length;

};