Commit 4d3e050b authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

net: lan966x: Use automatic selection of VCAP rule actionset 



Since commit 81e164c4 ("net: microchip: sparx5: Add automatic
selection of VCAP rule actionset") the VCAP API has the capability to
select automatically the actionset based on the actions that are attached
to the rule. So it is not needed anymore to hardcode the actionset in the
driver, therefore it is OK to remove this.

Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38d711aa

drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ static int lan966x_ptp_add_trap(struct lan966x_port *port, 
	if (err)

		goto free_rule;



	err = vcap_set_rule_set_actionset(vrule, VCAP_AFS_BASE_TYPE);

	err |= vcap_rule_add_action_bit(vrule, VCAP_AF_CPU_COPY_ENA, VCAP_BIT_1);

	err = vcap_rule_add_action_bit(vrule, VCAP_AF_CPU_COPY_ENA, VCAP_BIT_1);

	err |= vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE, LAN966X_PMM_REPLACE);

	err |= vcap_val_rule(vrule, proto);

	if (err)

drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c

+0 −2
Original line number Diff line number Diff line
@@ -261,8 +261,6 @@ static int lan966x_tc_flower_add(struct lan966x_port *port, 
							0);

			err |= vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE,

							LAN966X_PMM_REPLACE);

			err |= vcap_set_rule_set_actionset(vrule,

							   VCAP_AFS_BASE_TYPE);

			if (err)

				goto out;