From 310f36993face9b809430d27dac37f65a691b537 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 15 Nov 2012 22:10:56 -0800 Subject: [PATCH] nicira-ext: Remove NXFF_OPENFLOW12. This was meant to splice OXM support into OpenFlow 1.0, in place of NXM, but I no longer see any value in it. Signed-off-by: Ben Pfaff Reviewed-by: Simon Horman --- include/openflow/nicira-ext.h | 3 +-- lib/ofp-msgs.h | 2 +- lib/ofp-util.c | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h index 08ed9fc3..88eba19c 100644 --- a/include/openflow/nicira-ext.h +++ b/include/openflow/nicira-ext.h @@ -1767,8 +1767,7 @@ OFP_ASSERT(sizeof(struct nx_action_output_reg) == 24); enum nx_flow_format { NXFF_OPENFLOW10 = 0, /* Standard OpenFlow 1.0 compatible. */ - NXFF_NXM = 2, /* Nicira extended match. */ - NXFF_OPENFLOW12 = 3 /* OpenFlow 1.2 format. */ + NXFF_NXM = 2 /* Nicira extended match. */ }; /* NXT_SET_FLOW_FORMAT request. */ diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h index 5ed8705e..557524dc 100644 --- a/lib/ofp-msgs.h +++ b/lib/ofp-msgs.h @@ -271,7 +271,7 @@ enum ofpraw { /* NXT 1.0+ (11): struct nx_role_request. */ OFPRAW_NXT_ROLE_REPLY, - /* NXT 1.0+ (12): struct nx_set_flow_format. */ + /* NXT 1.0 (12): struct nx_set_flow_format. */ OFPRAW_NXT_SET_FLOW_FORMAT, /* NXT 1.0+ (15): struct nx_flow_mod_table_id. */ diff --git a/lib/ofp-util.c b/lib/ofp-util.c index ad3fb369..d4c240da 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -1233,7 +1233,9 @@ ofputil_encode_set_protocol(enum ofputil_protocol current, return ofputil_encode_nx_set_flow_format(NXFF_OPENFLOW10); case OFPUTIL_P_OF12_OXM: - return ofputil_encode_nx_set_flow_format(NXFF_OPENFLOW12); + /* There's only one OpenFlow 1.2 protocol and we already verified + * above that we're not trying to change versions. */ + NOT_REACHED(); case OFPUTIL_P_OF10_STD_TID: case OFPUTIL_P_OF10_NXM_TID: @@ -1283,9 +1285,6 @@ ofputil_nx_flow_format_to_protocol(enum nx_flow_format flow_format) case NXFF_NXM: return OFPUTIL_P_OF10_NXM; - case NXFF_OPENFLOW12: - return OFPUTIL_P_OF12_OXM; - default: return 0; } @@ -1308,8 +1307,6 @@ ofputil_nx_flow_format_to_string(enum nx_flow_format flow_format) return "openflow10"; case NXFF_NXM: return "nxm"; - case NXFF_OPENFLOW12: - return "openflow12"; default: NOT_REACHED(); } -- 2.30.2