Skip to content

Commit 4d3e050

Browse files
HoratiuVulturdavem330
authored andcommitted
net: lan966x: Use automatic selection of VCAP rule actionset
Since commit 81e164c ("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 <[email protected]> Reviewed-by: Alexander Lobakin <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 38d711a commit 4d3e050

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ static int lan966x_ptp_add_trap(struct lan966x_port *port,
8383
if (err)
8484
goto free_rule;
8585

86-
err = vcap_set_rule_set_actionset(vrule, VCAP_AFS_BASE_TYPE);
87-
err |= vcap_rule_add_action_bit(vrule, VCAP_AF_CPU_COPY_ENA, VCAP_BIT_1);
86+
err = vcap_rule_add_action_bit(vrule, VCAP_AF_CPU_COPY_ENA, VCAP_BIT_1);
8887
err |= vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE, LAN966X_PMM_REPLACE);
8988
err |= vcap_val_rule(vrule, proto);
9089
if (err)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,6 @@ static int lan966x_tc_flower_add(struct lan966x_port *port,
261261
0);
262262
err |= vcap_rule_add_action_u32(vrule, VCAP_AF_MASK_MODE,
263263
LAN966X_PMM_REPLACE);
264-
err |= vcap_set_rule_set_actionset(vrule,
265-
VCAP_AFS_BASE_TYPE);
266264
if (err)
267265
goto out;
268266

0 commit comments

Comments
 (0)