[ovs-dev] [ext-260 5/5] ofp-errors: New error code NXBIC_DUP_INSTRUCTION.

[Ben Pfaff]

This is a prototype of OpenFlow enhancement proposal EXT-260 "Add error
code for duplicate instruction."  It uses the error code proposed there.

Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 lib/ofp-actions.c |    4 +---
 lib/ofp-errors.h  |    3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index d6fc429..39bb9aa 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -948,9 +948,7 @@ decode_openflow11_instructions(const struct ofp11_instruction insts[],
         }
 
         if (out[type]) {
-            return OFPERR_OFPBAC_UNSUPPORTED_ORDER; /* No specific code for
-                                                     * a duplicate instruction
-                                                     * exist */
+            return OFPERR_NXBIC_DUP_INSTRUCTION;
         }
         out[type] = inst;
     }
diff --git a/lib/ofp-errors.h b/lib/ofp-errors.h
index 52e8d2d..1206a9b 100644
--- a/lib/ofp-errors.h
+++ b/lib/ofp-errors.h
@@ -254,6 +254,9 @@ enum ofperr {
     /* OF1.2+(3,8).  Permissions error. */
     OFPERR_OFPBIC_EPERM,
 
+    /* NX1.1(3,256), NX1.2+(1).  Duplicate instruction. */
+    OFPERR_NXBIC_DUP_INSTRUCTION,
+
 /* ## --------------- ## */
 /* ## OFPET_BAD_MATCH ## */
 /* ## --------------- ## */
-- 
1.7.10.4