OFPERR_NXBIC_DUP_TYPE is currently only used in
decode_openflow11_instructions() which is part of a non-NX extension
portion of the Open Flow 1.1+ implementation.
After recent discussion it has been decided to attempt to
only use standardised, albeit lest-specify, errors unless errors arise from use
of an NX extension.
With the above in mind it seems appropriate to:
* Use OFPERR_OFPIT_BAD_INSTRUCTION in place of OFPERR_NXBIC_DUP_TYPE.
* Remove OFPERR_NXBIC_DUP_TYPE as it is no longer used.
An unfortunate side-effect of this change is that the error for
the case in question is now less-specific.
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
lib/ofp-actions.c | 2 +-
lib/ofp-errors.h | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index 898455e..6fcfba8 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -857,7 +857,7 @@ decode_openflow11_instructions(const struct
ofp11_instruction insts[],
}
if (out[type]) {
- return OFPERR_NXBIC_DUP_TYPE;
+ return OFPERR_OFPIT_BAD_INSTRUCTION;
}
out[type] = inst;
}
diff --git a/lib/ofp-errors.h b/lib/ofp-errors.h
index 2f28a42..4d17ba9 100644
--- a/lib/ofp-errors.h
+++ b/lib/ofp-errors.h
@@ -238,9 +238,6 @@ enum ofperr {
/* OF1.2+(3,8). Permissions error. */
OFPERR_OFPBIC_EPERM,
- /* NX1.1+(3,256). Duplicate instruction type in set of instructions. */
- OFPERR_NXBIC_DUP_TYPE,
-
/* ## --------------- ## */
/* ## OFPET_BAD_MATCH ## */
/* ## --------------- ## */
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
