PAN-346 -- the meta-id match is breaking things, so we're backing it out
Revert "Loxigen: added src/dst meta id matches"
This reverts commit 6798fff95a652dabea64ca722e030f11b4f187b3.
diff --git a/openflow_input/oxm-1.2 b/openflow_input/oxm-1.2
index 37737c1..b18c6fb 100644
--- a/openflow_input/oxm-1.2
+++ b/openflow_input/oxm-1.2
@@ -433,25 +433,3 @@
uint16_t value;
uint16_t value_mask;
};
-
-struct of_oxm_src_meta_id {
- uint32_t type_len == 0x0003f001;
- uint8_t value;
-};
-
-struct of_oxm_src_meta_id_masked {
- uint32_t type_len == 0x0003f102;
- uint8_t value;
- uint8_t value_mask;
-};
-
-struct of_oxm_dst_meta_id {
- uint32_t type_len == 0x0003f201;
- uint8_t value;
-};
-
-struct of_oxm_dst_meta_id_masked {
- uint32_t type_len == 0x0003f302;
- uint8_t value;
- uint8_t value_mask;
-};
diff --git a/openflow_input/standard-1.0 b/openflow_input/standard-1.0
index 895a0b9..5d4405c 100644
--- a/openflow_input/standard-1.0
+++ b/openflow_input/standard-1.0
@@ -156,8 +156,6 @@
OFPFW_NW_DST_MASK = 0xfc000,
OFPFW_DL_VLAN_PCP = 0x100000,
OFPFW_NW_TOS = 0x200000,
- OFPFW_SRC_META_ID = 0x400000,
- OFPFW_DST_META_ID = 0x800000,
OFPFW_ALL = 0x3fffff,
};
@@ -564,8 +562,7 @@
uint16_t eth_type;
uint8_t ip_dscp;
uint8_t ip_proto;
- uint8_t src_meta_id;
- uint8_t dst_meta_id;
+ pad(2);
uint32_t ipv4_src;
uint32_t ipv4_dst;
uint16_t tcp_src;