ofp-errors: Introduce OF1.6 (proposed) error code for OFPBFC_BAD_VERSION.

ONF-JIRA: EXT-550
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Ryan Moats <rmoats@us.ibm.com>

diff --git a/include/openvswitch/ofp-errors.h b/include/openvswitch/ofp-errors.h
index 78c4991..f963d2b 100644 (file)
--- a/include/openvswitch/ofp-errors.h
+++ b/include/openvswitch/ofp-errors.h
@@ -704,9 +704,9 @@ enum ofperr {
     /* ONF1.3(2315), OF1.4+(17,15).  Bundle is locking the resource. */
     OFPERR_OFPBFC_BUNDLE_IN_PROGRESS,
 
-    /* NX1.3+(22).  In an OFPT_BUNDLE_ADD_MESSAGE, the OpenFlow version in the
-     * inner and outer messages differ. */
-    OFPERR_NXBFC_BAD_VERSION,
+    /* NX1.4-1.5(22), OF1.6+(17,19).  In an OFPT_BUNDLE_ADD_MESSAGE, the
+     * OpenFlow version in the inner and outer messages differ. */
+    OFPERR_OFPBFC_BAD_VERSION,
 
 /* ## ------------------------- ## */
 /* ## OFPET_FLOW_MONITOR_FAILED ## */

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index ef78c73..bb1535d 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -9735,7 +9735,7 @@ ofputil_decode_bundle_add(const struct ofp_header *oh,
 
     msg->msg = b.data;
     if (msg->msg->version != oh->version) {
-        return OFPERR_NXBFC_BAD_VERSION;
+        return OFPERR_OFPBFC_BAD_VERSION;
     }
     size_t inner_len = ntohs(msg->msg->length);
     if (inner_len < sizeof(struct ofp_header) || inner_len > b.size) {