summaryrefslogtreecommitdiff
path: root/lib/ofp-parse.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-11-22 10:10:14 -0800
committerBen Pfaff <blp@nicira.com>2010-11-22 10:10:14 -0800
commit844dff325b1f6a6f520fce9242c85162275ab7ad (patch)
tree29f3140c56bee750f37b80890b8078cde7b8db08 /lib/ofp-parse.c
parent0596e89755cea856d9615a46c17c4df2574107a3 (diff)
downloadopenvswitch-844dff325b1f6a6f520fce9242c85162275ab7ad.tar.gz
flow: Remove flow_to/from_match() in favor of cls_rule_to/from_match().
The flow_from_match() and flow_to_match() functions have to deal with most of the state in a cls_rule anyhow, and this will increase in upcoming commits, to the point that we might as well just use a cls_rule anyhow. This commit therefore deletes flow_from_match() and flow_to_match(), integrating their code into cls_rule_from_match() and the new function cls_rule_to_match(), respectively. It also changes each of the functions' callers to use the new cls_rule_*() function.
Diffstat (limited to 'lib/ofp-parse.c')
-rw-r--r--lib/ofp-parse.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index 20440323f..d0488ddb3 100644
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -608,8 +608,7 @@ parse_ofp_flow_mod_str(char *string, uint16_t command)
parse_ofp_str(&pf, buffer, string);
ofm = buffer->data;
- flow_to_match(&pf.rule.flow, pf.rule.wc.wildcards, NXFF_OPENFLOW10,
- &ofm->match);
+ cls_rule_to_match(&pf.rule, NXFF_OPENFLOW10, &ofm->match);
ofm->command = htons(command);
ofm->cookie = htonll(pf.cookie);
ofm->idle_timeout = htons(pf.idle_timeout);