summaryrefslogtreecommitdiff
path: root/ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch
diff options
context:
space:
mode:
Diffstat (limited to 'ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch')
-rw-r--r--ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch197
1 files changed, 197 insertions, 0 deletions
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch
new file mode 100644
index 0000000..592abe6
--- /dev/null
+++ b/ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch
@@ -0,0 +1,197 @@
1From b6fb68aaf672af71e60ecff9b6b03f1d5f42be0c Mon Sep 17 00:00:00 2001
2From: Yi Yang <yi.y.yang@intel.com>
3Date: Wed, 30 Nov 2016 12:22:19 +0800
4Subject: [PATCH 5/8] Change match field IDs and action IDs to adapt to ODL
5
6Signed-off-by: Yi Yang <yi.y.yang@intel.com>
7---
8 include/openvswitch/meta-flow.h | 42 ++++++++++++++++++++---------------------
9 lib/ofp-actions.c | 10 +++++-----
10 2 files changed, 26 insertions(+), 26 deletions(-)
11
12diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h
13index fa4129c..190c3d6 100644
14--- a/include/openvswitch/meta-flow.h
15+++ b/include/openvswitch/meta-flow.h
16@@ -502,7 +502,7 @@ enum OVS_PACKED_ENUM mf_field_id {
17 * Formatting: hexadecimal.
18 * Prerequisites: none.
19 * Access: read/write.
20- * NXM: NXM_NX_TUN_GPE_NP(200) since v2.4.
21+ * NXM: NXM_NX_TUN_GPE_NP(111) since v2.4.
22 * OXM: none.
23 */
24 MFF_TUN_GPE_NP,
25@@ -516,7 +516,7 @@ enum OVS_PACKED_ENUM mf_field_id {
26 * Formatting: hexadecimal.
27 * Prerequisites: none.
28 * Access: read/write.
29- * NXM: NXM_NX_TUN_GPE_FLAGS(201) since v2.4.
30+ * NXM: NXM_NX_TUN_GPE_FLAGS(112) since v2.4.
31 * OXM: none.
32 */
33 MFF_TUN_GPE_FLAGS,
34@@ -966,14 +966,14 @@ enum OVS_PACKED_ENUM mf_field_id {
35 * Formatting: hexadecimal.
36 * Prerequisites: none.
37 * Access: read/write.
38- * NXM: NXM_NX_XXREG0(111) since v2.6. <0>
39- * NXM: NXM_NX_XXREG1(112) since v2.6. <1>
40- * NXM: NXM_NX_XXREG2(113) since v2.6. <2>
41- * NXM: NXM_NX_XXREG3(114) since v2.6. <3>
42- * NXM: NXM_NX_XXREG4(115) since vX.Y. <4>
43- * NXM: NXM_NX_XXREG5(116) since vX.Y. <5>
44- * NXM: NXM_NX_XXREG6(117) since vX.Y. <6>
45- * NXM: NXM_NX_XXREG7(118) since vX.Y. <7>
46+ * NXM: NXM_NX_XXREG0(124) since v2.6. <0>
47+ * NXM: NXM_NX_XXREG1(125) since v2.6. <1>
48+ * NXM: NXM_NX_XXREG2(126) since v2.6. <2>
49+ * NXM: NXM_NX_XXREG3(127) since v2.6. <3>
50+ * NXM: NXM_NX_XXREG4(128) since vX.Y. <4>
51+ * NXM: NXM_NX_XXREG5(129) since vX.Y. <5>
52+ * NXM: NXM_NX_XXREG6(130) since vX.Y. <6>
53+ * NXM: NXM_NX_XXREG7(131) since vX.Y. <7>
54 * OXM: none.
55 */
56 MFF_XXREG0,
57@@ -1813,7 +1813,7 @@ enum OVS_PACKED_ENUM mf_field_id {
58 * Formatting: hexadecimal.
59 * Prerequisites: none.
60 * Access: read/write.
61- * NXM: NXM_NX_NSP(202) since v1.1.
62+ * NXM: NXM_NX_NSP(113) since v1.1.
63 * OXM: none.
64 * Prefix lookup member: nsp.
65 */
66@@ -1829,7 +1829,7 @@ enum OVS_PACKED_ENUM mf_field_id {
67 * Formatting: decimal.
68 * Prerequisites: none.
69 * Access: read/write.
70- * NXM: NXM_NX_NSI(203) since v1.1.
71+ * NXM: NXM_NX_NSI(114) since v1.1.
72 * OXM: none.
73 * Prefix lookup member: nsi.
74 */
75@@ -1846,7 +1846,7 @@ enum OVS_PACKED_ENUM mf_field_id {
76 * Formatting: hexadecimal.
77 * Prerequisites: none.
78 * Access: read/write.
79- * NXM: NXM_NX_NSH_C1(204) since v1.1.
80+ * NXM: NXM_NX_NSH_C1(115) since v1.1.
81 * OXM: none.
82 * Prefix lookup member: nshc1.
83 */
84@@ -1863,7 +1863,7 @@ enum OVS_PACKED_ENUM mf_field_id {
85 * Formatting: hexadecimal.
86 * Prerequisites: none.
87 * Access: read/write.
88- * NXM: NXM_NX_NSH_C2(205) since v1.1.
89+ * NXM: NXM_NX_NSH_C2(116) since v1.1.
90 * OXM: none.
91 * Prefix lookup member: nshc2.
92 */
93@@ -1880,7 +1880,7 @@ enum OVS_PACKED_ENUM mf_field_id {
94 * Formatting: hexadecimal.
95 * Prerequisites: none.
96 * Access: read/write.
97- * NXM: NXM_NX_NSH_C3(206) since v1.1.
98+ * NXM: NXM_NX_NSH_C3(117) since v1.1.
99 * OXM: none.
100 * Prefix lookup member: nshc3.
101 */
102@@ -1897,7 +1897,7 @@ enum OVS_PACKED_ENUM mf_field_id {
103 * Formatting: hexadecimal.
104 * Prerequisites: none.
105 * Access: read/write.
106- * NXM: NXM_NX_NSH_C4(207) since v1.1.
107+ * NXM: NXM_NX_NSH_C4(118) since v1.1.
108 * OXM: none.
109 * Prefix lookup member: nshc4.
110 */
111@@ -1913,7 +1913,7 @@ enum OVS_PACKED_ENUM mf_field_id {
112 * Formatting: decimal.
113 * Prerequisites: none.
114 * Access: read/write.
115- * NXM: NXM_NX_NSH_MDTYPE(208) since v1.1.
116+ * NXM: NXM_NX_NSH_MDTYPE(119) since v1.1.
117 * OXM: none.
118 */
119 MFF_NSH_MDTYPE,
120@@ -1928,7 +1928,7 @@ enum OVS_PACKED_ENUM mf_field_id {
121 * Formatting: decimal.
122 * Prerequisites: none.
123 * Access: read/write.
124- * NXM: NXM_NX_NSH_NP(209) since v1.1.
125+ * NXM: NXM_NX_NSH_NP(120) since v1.1.
126 * OXM: none.
127 */
128 MFF_NSH_NP,
129@@ -1942,7 +1942,7 @@ enum OVS_PACKED_ENUM mf_field_id {
130 * Formatting: Ethernet.
131 * Prerequisites: none.
132 * Access: read/write.
133- * NXM: NXM_NX_ENCAP_ETH_SRC(210) since v1.1.
134+ * NXM: NXM_NX_ENCAP_ETH_SRC(121) since v1.1.
135 * OXM: none.
136 */
137 MFF_ENCAP_ETH_SRC,
138@@ -1956,7 +1956,7 @@ enum OVS_PACKED_ENUM mf_field_id {
139 * Formatting: Ethernet.
140 * Prerequisites: none.
141 * Access: read/write.
142- * NXM: NXM_NX_ENCAP_ETH_DST(211) since v1.1.
143+ * NXM: NXM_NX_ENCAP_ETH_DST(122) since v1.1.
144 * OXM: none.
145 */
146 MFF_ENCAP_ETH_DST,
147@@ -1970,7 +1970,7 @@ enum OVS_PACKED_ENUM mf_field_id {
148 * Formatting: hexadecimal.
149 * Prerequisites: none.
150 * Access: read-only.
151- * NXM: NXM_NX_ENCAP_ETH_TYPE(212) since v1.1.
152+ * NXM: NXM_NX_ENCAP_ETH_TYPE(123) since v1.1.
153 * OXM: none.
154 */
155 MFF_ENCAP_ETH_TYPE,
156diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
157index 2935ca6..4939ef2 100644
158--- a/lib/ofp-actions.c
159+++ b/lib/ofp-actions.c
160@@ -196,7 +196,7 @@ enum ofp_raw_action_type {
161 /* NX1.0(4), OF1.1+(21): uint32_t. */
162 OFPAT_RAW_SET_QUEUE,
163
164- /* NX1.0(40), OF1.1+(22): uint32_t. */
165+ /* NX1.0(42), OF1.1+(22): uint32_t. */
166 OFPAT_RAW_GROUP,
167
168 /* OF1.1+(23): uint8_t. */
169@@ -289,7 +289,7 @@ enum ofp_raw_action_type {
170
171 /* NX1.0+(29): struct nx_action_sample. */
172 NXAST_RAW_SAMPLE,
173- /* NX1.0+(38): struct nx_action_sample2. */
174+ /* NX1.0+(40): struct nx_action_sample2. */
175 NXAST_RAW_SAMPLE2,
176
177 /* NX1.0+(34): struct nx_action_conjunction. */
178@@ -301,13 +301,13 @@ enum ofp_raw_action_type {
179 /* NX1.0+(36): struct nx_action_nat, ... */
180 NXAST_RAW_NAT,
181
182- /* NX1.0+(39): struct nx_action_output_trunc. */
183+ /* NX1.0+(41): struct nx_action_output_trunc. */
184 NXAST_RAW_OUTPUT_TRUNC,
185
186- /* NX1.0+(200): void. */
187+ /* NX1.0+(38): void. */
188 NXAST_RAW_PUSH_NSH,
189
190- /* NX1.0+(201): void. */
191+ /* NX1.0+(39): void. */
192 NXAST_RAW_POP_NSH,
193
194 /* ## ------------------ ## */
195--
1962.1.0
197