summaryrefslogtreecommitdiff
path: root/include/openvswitch/meta-flow.h
diff options
context:
space:
mode:
authorBen Pfaff <blp@ovn.org>2018-05-18 10:16:40 -0700
committerBen Pfaff <blp@ovn.org>2018-05-25 13:31:18 -0700
commitffc317b99150b907d20616c37a11f749fb64e6cd (patch)
tree12b366f2a3668e7d414eddb0b836d6ff8a3a78b1 /include/openvswitch/meta-flow.h
parentd4ee9a73f0050227826aa4418a1191169cc6d6be (diff)
downloadopenvswitch-ffc317b99150b907d20616c37a11f749fb64e6cd.tar.gz
ovs-fields: Correct ideas about which OXM classes are official.
The purpose of including an OpenFlow version in the notes in meta-flow.h and ovs-fields.7 is to explain what version of OpenFlow standardized a given field. NXOXM_* are not standardized so they should not have an OpenFlow version. This commit corrects it. Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Justin Pettit <jpettit@ovn.org>
Diffstat (limited to 'include/openvswitch/meta-flow.h')
-rw-r--r--include/openvswitch/meta-flow.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h
index 64470b524..627c8a391 100644
--- a/include/openvswitch/meta-flow.h
+++ b/include/openvswitch/meta-flow.h
@@ -239,7 +239,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: none.
* Access: read-only.
* NXM: NXM_NX_DP_HASH(35) since v2.2.
- * OXM: NXOXM_ET_DP_HASH(0) since OF1.5 and v2.4.
+ * OXM: NXOXM_ET_DP_HASH(0) since v2.4.
*/
MFF_DP_HASH,
@@ -460,7 +460,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: none.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_ET_ERSPAN_IDX(11) since OF1.5 and v2.10.
+ * OXM: NXOXM_ET_ERSPAN_IDX(11) since v2.10.
*/
MFF_TUN_ERSPAN_IDX,
@@ -474,7 +474,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: none.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_ET_ERSPAN_VER(12) since OF1.5 and v2.10.
+ * OXM: NXOXM_ET_ERSPAN_VER(12) since v2.10.
*/
MFF_TUN_ERSPAN_VER,
@@ -488,7 +488,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: none.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_ET_ERSPAN_DIR(13) since OF1.5 and v2.10.
+ * OXM: NXOXM_ET_ERSPAN_DIR(13) since v2.10.
*/
MFF_TUN_ERSPAN_DIR,
@@ -502,7 +502,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: none.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_ET_ERSPAN_HWID(14) since OF1.5 and v2.10.
+ * OXM: NXOXM_ET_ERSPAN_HWID(14) since v2.10.
*/
MFF_TUN_ERSPAN_HWID,
@@ -1810,7 +1810,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: NSH.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_NSH_FLAGS(1) since OF1.3 and v2.8.
+ * OXM: NXOXM_NSH_FLAGS(1) since v2.8.
*/
MFF_NSH_FLAGS,
@@ -1824,7 +1824,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: NSH.
* Access: read-only.
* NXM: none.
- * OXM: NXOXM_NSH_MDTYPE(2) since OF1.3 and v2.8.
+ * OXM: NXOXM_NSH_MDTYPE(2) since v2.8.
*/
MFF_NSH_MDTYPE,
@@ -1838,7 +1838,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: NSH.
* Access: read-only.
* NXM: none.
- * OXM: NXOXM_NSH_NP(3) since OF1.3 and v2.8.
+ * OXM: NXOXM_NSH_NP(3) since v2.8.
*/
MFF_NSH_NP,
@@ -1852,7 +1852,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: NSH.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_NSH_SPI(4) since OF1.3 and v2.8.
+ * OXM: NXOXM_NSH_SPI(4) since v2.8.
*/
MFF_NSH_SPI,
@@ -1866,7 +1866,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: NSH.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_NSH_SI(5) since OF1.3 and v2.8.
+ * OXM: NXOXM_NSH_SI(5) since v2.8.
*/
MFF_NSH_SI,
@@ -1880,10 +1880,10 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: NSH.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_NSH_C1(6) since OF1.3 and v2.8. <1>
- * OXM: NXOXM_NSH_C2(7) since OF1.3 and v2.8. <2>
- * OXM: NXOXM_NSH_C3(8) since OF1.3 and v2.8. <3>
- * OXM: NXOXM_NSH_C4(9) since OF1.3 and v2.8. <4>
+ * OXM: NXOXM_NSH_C1(6) since v2.8. <1>
+ * OXM: NXOXM_NSH_C2(7) since v2.8. <2>
+ * OXM: NXOXM_NSH_C3(8) since v2.8. <3>
+ * OXM: NXOXM_NSH_C4(9) since v2.8. <4>
*/
MFF_NSH_C1,
MFF_NSH_C2,
@@ -1900,7 +1900,7 @@ enum OVS_PACKED_ENUM mf_field_id {
* Prerequisites: NSH.
* Access: read/write.
* NXM: none.
- * OXM: NXOXM_NSH_TTL(10) since OF1.3 and v2.9.
+ * OXM: NXOXM_NSH_TTL(10) since v2.9.
*/
MFF_NSH_TTL,