ONF-JIRA: EXT-550 Signed-off-by: Ben Pfaff <b...@nicira.com> --- lib/ofp-errors.h | 6 +++--- lib/ofp-util.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/ofp-errors.h b/lib/ofp-errors.h index c020f7a..9e0ea5a 100644 --- a/lib/ofp-errors.h +++ b/lib/ofp-errors.h @@ -675,9 +675,9 @@ enum ofperr { /* OF1.4+(17,15). Bundle is locking the resource. */ OFPERR_OFPBFC_BUNDLE_IN_PROGRESS, - /* NX1.4+(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 8ac6ea6..b34d0a8 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -9158,7 +9158,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; } inner_len = ntohs(msg->msg->length); if (inner_len < sizeof(struct ofp_header) || inner_len > b.size) { -- 2.1.3 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev