net/mlx5: E-Switch, Fix vlan or qos setting in legacy mode

Vu Pham · Saeed Mahameed · commit 01f3d5db4a9a · 2020-07-09T19:27:05.000-07:00
Refactoring eswitch ingress acl codes accidentally inserts extra memset zero that removes vlan and/or qos setting in legacy mode. Fixes: 07bab95 ("net/mlx5: E-Switch, Refactor eswitch ingress acl codes") Signed-off-by: Vu Pham <vuhuong@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
@@ -217,7 +217,6 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw,
 	}
 
 	/* Create ingress allow rule */
-	memset(spec, 0, sizeof(*spec));
 	spec->match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;
 	flow_act.action = MLX5_FLOW_CONTEXT_ACTION_ALLOW;
 	vport->ingress.allow_rule = mlx5_add_flow_rules(vport->ingress.acl, spec,

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,6 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw,`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`/* Create ingress allow rule */`
`220`		`- memset(spec, 0, sizeof(*spec));`
`221`	`220`	`spec->match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;`
`222`	`221`	`flow_act.action = MLX5_FLOW_CONTEXT_ACTION_ALLOW;`
`223`	`222`	`vport->ingress.allow_rule = mlx5_add_flow_rules(vport->ingress.acl, spec,`