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

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

Merge tag 'mlx5-fixes-2019-11-06' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahamees says:

====================
Mellanox, mlx5 fixes 2019-11-06

This series introduces some fixes to mlx5 driver.

Please pull and let me know if there is any problem.

No -stable this time.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9c6850fe 950d3af7

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

+1 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ static int esw_create_offloads_fdb_tables(struct mlx5_eswitch *esw, int nvports) 
			    MLX5_CAP_GEN(dev, max_flow_counter_15_0);

	fdb_max = 1 << MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size);



	esw_debug(dev, "Create offloads FDB table, min (max esw size(2^%d), max counters(%d), groups(%d), max flow table size(2^%d))\n",

	esw_debug(dev, "Create offloads FDB table, min (max esw size(2^%d), max counters(%d), groups(%d), max flow table size(%d))\n",

		  MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size),

		  max_flow_counter, ESW_OFFLOADS_NUM_GROUPS,

		  fdb_max);

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

+2 −1
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ static bool mlx5_eswitch_offload_is_uplink_port(const struct mlx5_eswitch *esw, 
	u32 port_mask, port_value;



	if (MLX5_CAP_ESW_FLOWTABLE(esw->dev, flow_source))

		return spec->flow_context.flow_source == MLX5_VPORT_UPLINK;

		return spec->flow_context.flow_source ==

					MLX5_FLOW_CONTEXT_FLOW_SOURCE_UPLINK;



	port_mask = MLX5_GET(fte_match_param, spec->match_criteria,

			     misc_parameters.source_port);

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

+1 −0
Original line number Diff line number Diff line
@@ -1577,6 +1577,7 @@ int mlx5dr_action_destroy(struct mlx5dr_action *action) 
		break;

	case DR_ACTION_TYP_MODIFY_HDR:

		mlx5dr_icm_free_chunk(action->rewrite.chunk);

		kfree(action->rewrite.data);

		refcount_dec(&action->rewrite.dmn->refcount);

		break;

	default:

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

+2 −0
Original line number Diff line number Diff line
@@ -1096,6 +1096,8 @@ dr_rule_create_rule_nic(struct mlx5dr_rule *rule, 
	if (htbl)

		mlx5dr_htbl_put(htbl);



	kfree(hw_ste_arr);



	return 0;



free_ste: