git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-actions: sort OVSINST_OFPIT11_xxx value in execution order
[sliver-openvswitch.git]
/
lib
/
ofp-actions.h
diff --git
a/lib/ofp-actions.h
b/lib/ofp-actions.h
index
e3bad18
..
604b56c
100644
(file)
--- a/
lib/ofp-actions.h
+++ b/
lib/ofp-actions.h
@@
-493,28
+493,30
@@
OFPACTS
void ofpact_update_len(struct ofpbuf *, struct ofpact *);
void ofpact_pad(struct ofpbuf *);
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 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_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,
enum ovs_instruction_type {
#define DEFINE_INST(ENUM, STRUCT, EXTENSIBLE, NAME) OVSINST_##ENUM,