summaryrefslogtreecommitdiff
path: root/include/openflow/nicira-ext.h
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-11-15 22:10:56 -0800
committerBen Pfaff <blp@nicira.com>2012-11-16 09:20:26 -0800
commit310f36993face9b809430d27dac37f65a691b537 (patch)
tree5f8d692c854b188bad936ac881e28dd6a75eba66 /include/openflow/nicira-ext.h
parente43928f2862b83a3c13e8662490a22fa25405be5 (diff)
downloadopenvswitch-310f36993face9b809430d27dac37f65a691b537.tar.gz
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 <blp@nicira.com> Reviewed-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include/openflow/nicira-ext.h')
-rw-r--r--include/openflow/nicira-ext.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index 08ed9fc36..88eba19c3 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. */