tunnel_id oxm location in spec file is adjusted, and loci files are updated according to the change.
diff --git a/openflow_input/oxm-1.2 b/openflow_input/oxm-1.2
index 4eed2ef..9ee3817 100644
--- a/openflow_input/oxm-1.2
+++ b/openflow_input/oxm-1.2
@@ -432,13 +432,3 @@
uint16_t value_mask;
};
-struct of_oxm_tunnel_id : of_oxm {
- uint32_t type_len == 0x80004c08;
- uint64_t value;
-};
-
-struct of_oxm_tunnel_id_masked : of_oxm {
- uint32_t type_len == 0x80004d10;
- uint64_t value;
- uint64_t value_mask;
-};
diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3
index 19940ac..a94e16b 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -2119,3 +2119,18 @@
uint32_t flow_removed_mask_equal_master;
uint32_t flow_removed_mask_slave;
};
+
+////////////////////////////////////////////////////////////////
+// OXMs introduced to 1.3
+////////////////////////////////////////////////////////////////
+
+struct of_oxm_tunnel_id : of_oxm {
+ uint32_t type_len == 0x80004c08;
+ uint64_t value;
+};
+
+struct of_oxm_tunnel_id_masked : of_oxm {
+ uint32_t type_len == 0x80004d10;
+ uint64_t value;
+ uint64_t value_mask;
+};