[ovs-dev] [PATCH] Remove circular dependency that crept into meta-flow.h via the ofputil_protocol enum. This one is defined in ofp-util.h which itself includes meta-flow.h. This change replaces the enum with uint32_t which is the consitent choice within this module.

John Reumann nofutznetworks at gmail.com
Sat Oct 3 01:34:07 UTC 2015


---
 lib/meta-flow.c | 2 +-
 lib/meta-flow.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index 224ba53..9462b61 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -1616,7 +1616,7 @@ 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
+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)
diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index 02272ef..822cd83 100644
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -1861,10 +1861,10 @@ void mf_get(const struct mf_field *, const struct match *,
             union mf_value *value, union mf_value *mask);
 
 /* Returns the set of usable protocols. */
-enum ofputil_protocol mf_set(const struct mf_field *,
-                             const union mf_value *value,
-                             const union mf_value *mask,
-                             struct match *, char **err_str);
+uint32_t mf_set(const struct mf_field *,
+                const union mf_value *value,
+                const union mf_value *mask,
+		struct match *, char **err_str);
 
 void mf_set_wild(const struct mf_field *, struct match *, char **err_str);
 
-- 
1.9.1




More information about the dev mailing list