util: Introduce ASSIGN_CONTAINER to make iteration macros easier to read.

[openvswitch] / lib / ofp-util.h

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index fdca005fb217a155445e9fefc4798300e070d89d..02096b0ba16f3636139aabd7b649c9045cdd1966 100644 (file)
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -22,6 +22,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "flow.h"
+#include "openflow/nicira-ext.h"
 #include "openvswitch/types.h"
 
 struct cls_rule;
@@ -38,9 +39,9 @@ int ofputil_netmask_to_wcbits(ovs_be32 netmask);
 
 /* Work with OpenFlow 1.0 ofp_match. */
 void ofputil_cls_rule_from_match(const struct ofp_match *,
-                                 unsigned int priority, int flow_format,
+                                 unsigned int priority, enum nx_flow_format,
                                  uint64_t cookie, struct cls_rule *);
-void ofputil_cls_rule_to_match(const struct cls_rule *, int flow_format,
+void ofputil_cls_rule_to_match(const struct cls_rule *, enum nx_flow_format,
                                struct ofp_match *);
 void normalize_match(struct ofp_match *);
 char *ofp_match_to_literal_string(const struct ofp_match *match);