The name was misleading because it in fact parses lflow match instead
of actions.
Fixes: 1213bc8270 ("ovn-controller: Cache logical flow expr matches.")
Cc: Numan Siddique <[email protected]>
Signed-off-by: Han Zhou <[email protected]>
---
controller/lflow.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/controller/lflow.c b/controller/lflow.c
index e785866..9a96aac 100644
--- a/controller/lflow.c
+++ b/controller/lflow.c
@@ -720,15 +720,15 @@ add_matches_to_flow_table(const struct sbrec_logical_flow
*lflow,
ofpbuf_uninit(&ofpacts);
}
-/* Converts the actions and returns the simplified expre tree.
+/* Converts the match and returns the simplified expre tree.
* The caller should evaluate the conditions and normalize the
* expr tree. */
static struct expr *
-convert_acts_to_expr(const struct sbrec_logical_flow *lflow,
- struct expr *prereqs,
- struct lflow_ctx_in *l_ctx_in,
- struct lflow_ctx_out *l_ctx_out,
- bool *pg_addr_set_ref, char **errorp)
+convert_match_to_expr(const struct sbrec_logical_flow *lflow,
+ struct expr *prereqs,
+ struct lflow_ctx_in *l_ctx_in,
+ struct lflow_ctx_out *l_ctx_out,
+ bool *pg_addr_set_ref, char **errorp)
{
struct sset addr_sets_ref = SSET_INITIALIZER(&addr_sets_ref);
struct sset port_groups_ref = SSET_INITIALIZER(&port_groups_ref);
@@ -861,7 +861,7 @@ consider_logical_flow(const struct sbrec_logical_flow
*lflow,
struct expr *expr = NULL;
if (!l_ctx_out->lflow_cache_map) {
/* Caching is disabled. */
- expr = convert_acts_to_expr(lflow, prereqs, l_ctx_in,
+ expr = convert_match_to_expr(lflow, prereqs, l_ctx_in,
l_ctx_out, NULL, &error);
if (error) {
expr_destroy(prereqs);
@@ -924,7 +924,7 @@ consider_logical_flow(const struct sbrec_logical_flow
*lflow,
bool pg_addr_set_ref = false;
if (!expr) {
- expr = convert_acts_to_expr(lflow, prereqs, l_ctx_in, l_ctx_out,
+ expr = convert_match_to_expr(lflow, prereqs, l_ctx_in, l_ctx_out,
&pg_addr_set_ref, &error);
if (error) {
expr_destroy(prereqs);
--
2.1.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
