diff options
| author | Jarno Rajahalme <jrajahalme@nicira.com> | 2013-10-24 13:19:31 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-11-01 16:07:08 -0700 |
| commit | e3f8f887480856064fab42bc01ae364d64506d85 (patch) | |
| tree | 7d2b3509f8df1cc54bdd14e9f2ff0c4d872bc6ff /lib/ofp-actions.h | |
| parent | a6fd70bb8944cc4144af287105b6b39a19442b04 (diff) | |
| download | openvswitch-e3f8f887480856064fab42bc01ae364d64506d85.tar.gz | |
ofp-actions: Simplify interface and internal structure.
This makes later changes simpler.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/ofp-actions.h')
| -rw-r--r-- | lib/ofp-actions.h | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h index 2268a36a6..db2c02897 100644 --- a/lib/ofp-actions.h +++ b/lib/ofp-actions.h @@ -577,30 +577,26 @@ struct ofpact_group { }; /* Converting OpenFlow to ofpacts. */ -enum ofperr ofpacts_pull_openflow10(struct ofpbuf *openflow, - unsigned int actions_len, - struct ofpbuf *ofpacts); -enum ofperr ofpacts_pull_openflow11_actions(struct ofpbuf *openflow, - enum ofp_version version, - unsigned int actions_len, - struct ofpbuf *ofpacts); -enum ofperr ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, - enum ofp_version version, - unsigned int instructions_len, - struct ofpbuf *ofpacts); +enum ofperr ofpacts_pull_openflow_actions(struct ofpbuf *openflow, + unsigned int actions_len, + enum ofp_version version, + struct ofpbuf *ofpacts); +enum ofperr ofpacts_pull_openflow_instructions(struct ofpbuf *openflow, + unsigned int instructions_len, + enum ofp_version version, + struct ofpbuf *ofpacts); enum ofperr ofpacts_check(struct ofpact[], size_t ofpacts_len, struct flow *, ofp_port_t max_ports, uint8_t table_id, bool enforce_consistency); enum ofperr ofpacts_verify(const struct ofpact ofpacts[], size_t ofpacts_len); /* Converting ofpacts to OpenFlow. */ -void ofpacts_put_openflow10(const struct ofpact[], size_t ofpacts_len, - struct ofpbuf *openflow); -size_t ofpacts_put_openflow11_actions(const struct ofpact[], size_t ofpacts_len, - struct ofpbuf *openflow); -void ofpacts_put_openflow11_instructions(const struct ofpact[], - size_t ofpacts_len, - struct ofpbuf *openflow); +size_t ofpacts_put_openflow_actions(const struct ofpact[], size_t ofpacts_len, + struct ofpbuf *openflow, enum ofp_version); +void ofpacts_put_openflow_instructions(const struct ofpact[], + size_t ofpacts_len, + struct ofpbuf *openflow, + enum ofp_version ofp_version); /* Working with ofpacts. */ bool ofpacts_output_to_port(const struct ofpact[], size_t ofpacts_len, |