This order is used by parser from text string to check if the instruction
is given in this order.
Signed-off-by: Isaku Yamahata <yamah...@valinux.co.jp>
---
v4
- improve commit message/comment to clarify it's for parser from text string
v3
- newly introduced
---
lib/ofp-actions.h | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h
index 3de2719..f128095 100644
--- a/lib/ofp-actions.h
+++ b/lib/ofp-actions.h
@@ -494,28 +494,30 @@ OFPACTS
void ofpact_update_len(struct ofpbuf *, struct ofpact *);
void ofpact_pad(struct ofpbuf *);
-/* OpenFlow 1.1 instructions. */
-
+/* OpenFlow 1.1 instructions.
+ * The order is sorted in execution order. Not in the value of OFPIT11_xxx.
+ * It is enforced on parser from text string.
+ */
#define OVS_INSTRUCTIONS \
- DEFINE_INST(OFPIT11_GOTO_TABLE, \
- ofp11_instruction_goto_table, false, \
- "goto_table") \
+ DEFINE_INST(OFPIT11_APPLY_ACTIONS, \
+ ofp11_instruction_actions, true, \
+ "apply_actions") \
\
- DEFINE_INST(OFPIT11_WRITE_METADATA, \
- ofp11_instruction_write_metadata, false, \
- "write_metadata") \
+ DEFINE_INST(OFPIT11_CLEAR_ACTIONS, \
+ ofp11_instruction, false, \
+ "clear_actions") \
\
DEFINE_INST(OFPIT11_WRITE_ACTIONS, \
ofp11_instruction_actions, true, \
"write_actions") \
\
- DEFINE_INST(OFPIT11_APPLY_ACTIONS, \
- ofp11_instruction_actions, true, \
- "apply_actions") \
+ DEFINE_INST(OFPIT11_WRITE_METADATA, \
+ ofp11_instruction_write_metadata, false, \
+ "write_metadata") \
\
- DEFINE_INST(OFPIT11_CLEAR_ACTIONS, \
- ofp11_instruction, false, \
- "clear_actions")
+ DEFINE_INST(OFPIT11_GOTO_TABLE, \
+ ofp11_instruction_goto_table, false, \
+ "goto_table")
enum ovs_instruction_type {
#define DEFINE_INST(ENUM, STRUCT, EXTENSIBLE, NAME) OVSINST_##ENUM,
--
1.7.1.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
