Commit 08fac109 authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Saeed Mahameed

net/mlx5: DR, Rename list field in matcher struct to list_node

In dr_types structs, some list fields are list heads, and some
are just list nodes that are stored on the other structs' lists.
Rename the appropriate list field to reflect this distinction.
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
parent 32e9bd58
...@@ -721,7 +721,7 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) ...@@ -721,7 +721,7 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher)
int ret; int ret;
next_matcher = NULL; next_matcher = NULL;
list_for_each_entry(tmp_matcher, &tbl->matcher_list, matcher_list) { list_for_each_entry(tmp_matcher, &tbl->matcher_list, list_node) {
if (tmp_matcher->prio >= matcher->prio) { if (tmp_matcher->prio >= matcher->prio) {
next_matcher = tmp_matcher; next_matcher = tmp_matcher;
break; break;
...@@ -731,11 +731,11 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) ...@@ -731,11 +731,11 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher)
prev_matcher = NULL; prev_matcher = NULL;
if (next_matcher && !first) if (next_matcher && !first)
prev_matcher = list_prev_entry(next_matcher, matcher_list); prev_matcher = list_prev_entry(next_matcher, list_node);
else if (!first) else if (!first)
prev_matcher = list_last_entry(&tbl->matcher_list, prev_matcher = list_last_entry(&tbl->matcher_list,
struct mlx5dr_matcher, struct mlx5dr_matcher,
matcher_list); list_node);
if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB || if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||
dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) { dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {
...@@ -756,12 +756,12 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) ...@@ -756,12 +756,12 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher)
} }
if (prev_matcher) if (prev_matcher)
list_add(&matcher->matcher_list, &prev_matcher->matcher_list); list_add(&matcher->list_node, &prev_matcher->list_node);
else if (next_matcher) else if (next_matcher)
list_add_tail(&matcher->matcher_list, list_add_tail(&matcher->list_node,
&next_matcher->matcher_list); &next_matcher->list_node);
else else
list_add(&matcher->matcher_list, &tbl->matcher_list); list_add(&matcher->list_node, &tbl->matcher_list);
return 0; return 0;
} }
...@@ -968,7 +968,7 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl, ...@@ -968,7 +968,7 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl,
matcher->prio = priority; matcher->prio = priority;
matcher->match_criteria = match_criteria_enable; matcher->match_criteria = match_criteria_enable;
refcount_set(&matcher->refcount, 1); refcount_set(&matcher->refcount, 1);
INIT_LIST_HEAD(&matcher->matcher_list); INIT_LIST_HEAD(&matcher->list_node);
mlx5dr_domain_lock(tbl->dmn); mlx5dr_domain_lock(tbl->dmn);
...@@ -1031,15 +1031,15 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher) ...@@ -1031,15 +1031,15 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher)
struct mlx5dr_domain *dmn = tbl->dmn; struct mlx5dr_domain *dmn = tbl->dmn;
int ret = 0; int ret = 0;
if (list_is_last(&matcher->matcher_list, &tbl->matcher_list)) if (list_is_last(&matcher->list_node, &tbl->matcher_list))
next_matcher = NULL; next_matcher = NULL;
else else
next_matcher = list_next_entry(matcher, matcher_list); next_matcher = list_next_entry(matcher, list_node);
if (matcher->matcher_list.prev == &tbl->matcher_list) if (matcher->list_node.prev == &tbl->matcher_list)
prev_matcher = NULL; prev_matcher = NULL;
else else
prev_matcher = list_prev_entry(matcher, matcher_list); prev_matcher = list_prev_entry(matcher, list_node);
if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB || if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||
dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) { dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {
...@@ -1059,7 +1059,7 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher) ...@@ -1059,7 +1059,7 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher)
return ret; return ret;
} }
list_del(&matcher->matcher_list); list_del(&matcher->list_node);
return 0; return 0;
} }
......
...@@ -19,7 +19,7 @@ int mlx5dr_table_set_miss_action(struct mlx5dr_table *tbl, ...@@ -19,7 +19,7 @@ int mlx5dr_table_set_miss_action(struct mlx5dr_table *tbl,
if (!list_empty(&tbl->matcher_list)) if (!list_empty(&tbl->matcher_list))
last_matcher = list_last_entry(&tbl->matcher_list, last_matcher = list_last_entry(&tbl->matcher_list,
struct mlx5dr_matcher, struct mlx5dr_matcher,
matcher_list); list_node);
if (tbl->dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX || if (tbl->dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX ||
tbl->dmn->type == MLX5DR_DOMAIN_TYPE_FDB) { tbl->dmn->type == MLX5DR_DOMAIN_TYPE_FDB) {
......
...@@ -881,7 +881,7 @@ struct mlx5dr_matcher { ...@@ -881,7 +881,7 @@ struct mlx5dr_matcher {
struct mlx5dr_table *tbl; struct mlx5dr_table *tbl;
struct mlx5dr_matcher_rx_tx rx; struct mlx5dr_matcher_rx_tx rx;
struct mlx5dr_matcher_rx_tx tx; struct mlx5dr_matcher_rx_tx tx;
struct list_head matcher_list; struct list_head list_node;
u32 prio; u32 prio;
struct mlx5dr_match_param mask; struct mlx5dr_match_param mask;
u8 match_criteria; u8 match_criteria;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment