net: lan966x: Use automatic selection of VCAP rule actionset

Since commit 81e164c4aec5 ("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: Horatiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
index a8348437dd87f6304ef0a9004e5f35964a88f92a..ded9ab79ccc21c53a51904c9971a9643b11aef91 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
@@ -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)

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c b/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c
index bd10a7189741876078c6b0365b543fe4ef50102c..f960727ecaeec7cdc6f7bc357ec4565f71fe1e4b 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c
@@ -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;