diff options
| author | Ben Pfaff <blp@nicira.com> | 2014-08-11 11:07:53 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-08-11 11:07:53 -0700 |
| commit | 8e97815ea7b8a45ab8c0c2d90ee163f813b0b4b5 (patch) | |
| tree | dca0626704cacd450c32ea39dd338807ac94746f /include/openflow | |
| parent | 08d1e2345660f563d95c53719cd305048b67a27e (diff) | |
| download | openvswitch-8e97815ea7b8a45ab8c0c2d90ee163f813b0b4b5.tar.gz | |
ofp-actions: Add instructions bitmaps and fix related bug.
This will allow, later, to centralize all of the knowledge of instruction
encoding inside ofp-actions.
OFPIT11_ALL and OFPIT13_ALL are no longer used, so this commit removes
them. Their definitions were wrong (they did not shift each bit into
position correctly), so this commit is also a small bug fix.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Diffstat (limited to 'include/openflow')
| -rw-r--r-- | include/openflow/openflow-1.1.h | 4 | ||||
| -rw-r--r-- | include/openflow/openflow-1.3.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h index bb6bcb0b3..5e618c9ef 100644 --- a/include/openflow/openflow-1.1.h +++ b/include/openflow/openflow-1.1.h @@ -290,10 +290,6 @@ enum ofp11_instruction_type { OFPIT11_EXPERIMENTER = 0xFFFF /* Experimenter instruction */ }; -#define OFPIT11_ALL (OFPIT11_GOTO_TABLE | OFPIT11_WRITE_METADATA | \ - OFPIT11_WRITE_ACTIONS | OFPIT11_APPLY_ACTIONS | \ - OFPIT11_CLEAR_ACTIONS) - #define OFP11_INSTRUCTION_ALIGN 8 /* Generic ofp_instruction structure. */ diff --git a/include/openflow/openflow-1.3.h b/include/openflow/openflow-1.3.h index cc425f1d1..39de5b3bd 100644 --- a/include/openflow/openflow-1.3.h +++ b/include/openflow/openflow-1.3.h @@ -91,10 +91,6 @@ enum ofp13_instruction_type { OFPIT13_METER = 6 /* Apply meter (rate limiter) */ }; -#define OFPIT13_ALL (OFPIT11_GOTO_TABLE | OFPIT11_WRITE_METADATA | \ - OFPIT11_WRITE_ACTIONS | OFPIT11_APPLY_ACTIONS | \ - OFPIT11_CLEAR_ACTIONS | OFPIT13_METER) - /* Instruction structure for OFPIT_METER */ struct ofp13_instruction_meter { ovs_be16 type; /* OFPIT13_METER */ |