ofp-util: Allow use of OpenFlow 12 flow format

[openvswitch] / lib / ofp-util.h

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index a081cbf0bd26467c7ffffdd2a762993429ffdbe0..edefa2defb1ebc29f5813dd6cc35d1ac6692ba0a 100644 (file)
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -86,10 +86,12 @@ enum ofputil_protocol {
     OFPUTIL_P_OF12_OXM      = 1 << 4,
 
     /* All protocols. */
-#define OFPUTIL_P_ANY (OFPUTIL_P_OF10_STD_ANY | OFPUTIL_P_OF10_NXM_ANY)
+#define OFPUTIL_P_ANY ((1 << 5) - 1)
 
     /* Protocols in which a specific table may be specified in flow_mods. */
-#define OFPUTIL_P_TID (OFPUTIL_P_OF10_STD_TID | OFPUTIL_P_OF10_NXM_TID)
+#define OFPUTIL_P_TID (OFPUTIL_P_OF10_STD_TID | \
+                       OFPUTIL_P_OF10_NXM_TID | \
+                       OFPUTIL_P_OF12_OXM)
 };
 
 /* Protocols to use for flow dumps, from most to least preferred. */