diff options
| author | Jarno Rajahalme <jrajahalme@nicira.com> | 2015-10-09 17:24:00 -0700 |
|---|---|---|
| committer | Jarno Rajahalme <jrajahalme@nicira.com> | 2015-10-09 17:24:00 -0700 |
| commit | 1fd58977ba55abeecf868809f93547f5ade5c5f1 (patch) | |
| tree | 39ed5904c1606828f605f0ada2f4ce4d5991d7a7 /lib/meta-flow.c | |
| parent | ccb75a285bab733ec7b08da366aab438a884bf97 (diff) | |
| download | openvswitch-1fd58977ba55abeecf868809f93547f5ade5c5f1.tar.gz | |
meta-flow: Remove circular dependency on enum ofputil_protocol.
enum ofputil_protocol is defined in lib/ofp-util.h, which also
includes lib/meta-flow.h. We have already replaced the sets of usable
protocols in struct mf_field with uint32_t for this reason. Do the
same for the return value of mf_set().
Suggested-by: John Reumann <nofutznetworks@gmail.com>
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Diffstat (limited to 'lib/meta-flow.c')
| -rw-r--r-- | lib/meta-flow.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 224ba538e..9778bff8e 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -1615,8 +1615,12 @@ mf_set_wild(const struct mf_field *mf, struct match *match, char **err_str) * * If non-NULL, 'err_str' returns a malloc'ed string describing any errors * with the request or NULL if there is no error. The caller is reponsible - * for freeing the string.*/ -enum ofputil_protocol + * for freeing the string. + * + * Return a set of enum ofputil_protocol bits (as an uint32_t to avoid circular + * dependency on enum ofputil_protocol definition) indicating which OpenFlow + * protocol versions can support this functionality. */ +uint32_t mf_set(const struct mf_field *mf, const union mf_value *value, const union mf_value *mask, struct match *match, char **err_str) |