Skip to content

Commit 940390d

Browse files
mark-blochkuba-moo
authored andcommitted
net/mlx5: fs, move hardware fte deletion function reset
Downstream patches will need this as we might not want to reset it when a pending rule is connected to the FTE. Signed-off-by: Mark Bloch <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent da2f660 commit 940390d

File tree

1 file changed

+2
-2
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,8 @@ static void del_hw_fte(struct fs_node *node)
683683
fte->index, fg->id);
684684
node->active = false;
685685
}
686+
/* Avoid double call to del_hw_fte */
687+
fte->node.del_hw_func = NULL;
686688
}
687689

688690
static void del_sw_fte(struct fs_node *node)
@@ -2265,8 +2267,6 @@ void mlx5_del_flow_rules(struct mlx5_flow_handle *handle)
22652267
tree_remove_node(&handle->rule[i]->node, true);
22662268
if (list_empty(&fte->node.children)) {
22672269
fte->node.del_hw_func(&fte->node);
2268-
/* Avoid double call to del_hw_fte */
2269-
fte->node.del_hw_func = NULL;
22702270
up_write_ref_node(&fte->node, false);
22712271
tree_put_node(&fte->node, false);
22722272
} else if (fte->dests_size) {

0 commit comments

Comments
 (0)