Skip to content

Commit

Permalink
net/mlx5e: Refactor tc del flow to accept mlx5e_tc_flow instance
Browse files Browse the repository at this point in the history
Change the function that deletes offloaded TC rule to get
struct mlx5e_tc_flow instance which contains both the flow
handle and flow attributes. This is a cleanup needed for
downstream patches, it doesn't change any functionality.

Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Roi Dayan authored and David S. Miller committed Dec 2, 2016
1 parent 86a33ae commit 961e897
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,17 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
}

static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,
struct mlx5_flow_handle *rule,
struct mlx5_esw_flow_attr *attr)
struct mlx5e_tc_flow *flow)
{
struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
struct mlx5_fc *counter = NULL;

counter = mlx5_flow_rule_counter(rule);
counter = mlx5_flow_rule_counter(flow->rule);

mlx5_del_flow_rules(rule);
mlx5_del_flow_rules(flow->rule);

if (esw && esw->mode == SRIOV_OFFLOADS)
mlx5_eswitch_del_vlan_action(esw, attr);
mlx5_eswitch_del_vlan_action(esw, flow->attr);

mlx5_fc_destroy(priv->mdev, counter);

Expand Down Expand Up @@ -1005,7 +1004,7 @@ int mlx5e_delete_flower(struct mlx5e_priv *priv,

rhashtable_remove_fast(&tc->ht, &flow->node, tc->ht_params);

mlx5e_tc_del_flow(priv, flow->rule, flow->attr);
mlx5e_tc_del_flow(priv, flow);

if (flow->attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP)
mlx5e_detach_encap(priv, flow);
Expand Down Expand Up @@ -1065,7 +1064,7 @@ static void _mlx5e_tc_del_flow(void *ptr, void *arg)
struct mlx5e_tc_flow *flow = ptr;
struct mlx5e_priv *priv = arg;

mlx5e_tc_del_flow(priv, flow->rule, flow->attr);
mlx5e_tc_del_flow(priv, flow);
kfree(flow);
}

Expand Down

0 comments on commit 961e897

Please sign in to comment.