History

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.

Yevgeny Kliteynik committed 4 years ago

Commit 08fac101 parent 32e9bd53 files · +15 −15Browse files

Unified · Split

3 files
  1. drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c +13 −13
  2. drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c +1 −1
  3. drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h +1 −1
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c+13−13
@@ -721,7 +721,7 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) · 720 unmodified lines
721721 int ret;
722722
723723 next_matcher = NULL;
724− list_for_each_entry(tmp_matcher, &tbl->matcher_list, matcher_list) {
724+ list_for_each_entry(tmp_matcher, &tbl->matcher_list, list_node) {
725725 if (tmp_matcher->prio >= matcher->prio) {
726726 next_matcher = tmp_matcher;
727727 break;
@@ -731,11 +731,11 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) · 3 unmodified lines
731731
732732 prev_matcher = NULL;
733733 if (next_matcher && !first)
734− prev_matcher = list_prev_entry(next_matcher, matcher_list);
734+ prev_matcher = list_prev_entry(next_matcher, list_node);
735735 else if (!first)
736736 prev_matcher = list_last_entry(&tbl->matcher_list,
737737 struct mlx5dr_matcher,
738− matcher_list);
738+ list_node);
739739
740740 if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||
741741 dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {
@@ -756,12 +756,12 @@ static int dr_matcher_add_to_tbl(struct mlx5dr_matcher *matcher) · 14 unmodified lines
756756 }
757757
758758 if (prev_matcher)
759− list_add(&matcher->matcher_list, &prev_matcher->matcher_list);
759+ list_add(&matcher->list_node, &prev_matcher->list_node);
760760 else if (next_matcher)
761− list_add_tail(&matcher->matcher_list,
762− &next_matcher->matcher_list);
761+ list_add_tail(&matcher->list_node,
762+ &next_matcher->list_node);
763763 else
764− list_add(&matcher->matcher_list, &tbl->matcher_list);
764+ list_add(&matcher->list_node, &tbl->matcher_list);
765765
766766 return 0;
767767 }
@@ -968,7 +968,7 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl, · 200 unmodified lines
968968 matcher->prio = priority;
969969 matcher->match_criteria = match_criteria_enable;
970970 refcount_set(&matcher->refcount, 1);
971− INIT_LIST_HEAD(&matcher->matcher_list);
971+ INIT_LIST_HEAD(&matcher->list_node);
972972
973973 mlx5dr_domain_lock(tbl->dmn);
974974
@@ -1031,15 +1031,15 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher) · 56 unmodified lines
10311031 struct mlx5dr_domain *dmn = tbl->dmn;
10321032 int ret = 0;
10331033
1034− if (list_is_last(&matcher->matcher_list, &tbl->matcher_list))
1034+ if (list_is_last(&matcher->list_node, &tbl->matcher_list))
10351035 next_matcher = NULL;
10361036 else
1037− next_matcher = list_next_entry(matcher, matcher_list);
1037+ next_matcher = list_next_entry(matcher, list_node);
10381038
1039− if (matcher->matcher_list.prev == &tbl->matcher_list)
1039+ if (matcher->list_node.prev == &tbl->matcher_list)
10401040 prev_matcher = NULL;
10411041 else
1042− prev_matcher = list_prev_entry(matcher, matcher_list);
1042+ prev_matcher = list_prev_entry(matcher, list_node);
10431043
10441044 if (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||
10451045 dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX) {
@@ -1059,7 +1059,7 @@ static int dr_matcher_remove_from_tbl(struct mlx5dr_matcher *matcher) · 13 unmodified lines
10591059 return ret;
10601060 }
10611061
1062− list_del(&matcher->matcher_list);
1062+ list_del(&matcher->list_node);
10631063
10641064 return 0;
10651065 }
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c+1−1
@@ -19,7 +19,7 @@ int mlx5dr_table_set_miss_action(struct mlx5dr_table *tbl, · 18 unmodified lines
1919 if (!list_empty(&tbl->matcher_list))
2020 last_matcher = list_last_entry(&tbl->matcher_list,
2121 struct mlx5dr_matcher,
22− matcher_list);
22+ list_node);
2323
2424 if (tbl->dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX ||
2525 tbl->dmn->type == MLX5DR_DOMAIN_TYPE_FDB) {
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h+1−1
@@ -881,7 +881,7 @@ struct mlx5dr_matcher { · 880 unmodified lines
881881 struct mlx5dr_table *tbl;
882882 struct mlx5dr_matcher_rx_tx rx;
883883 struct mlx5dr_matcher_rx_tx tx;
884− struct list_head matcher_list;
884+ struct list_head list_node;
885885 u32 prio;
886886 struct mlx5dr_match_param mask;
887887 u8 match_criteria;