X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fflow.h;h=568e2919a5599868e5f13875f637ba7eeead4be2;hb=42edbe39dd2dcb94ef2f43dacb3e43a01bcf1f86;hp=5e78f7963b1dfbb72b1915e4a7089a793f28db90;hpb=54fa24c559938dec9be7cb64de741fe36ee83e07;p=sliver-openvswitch.git

diff --git a/lib/flow.h b/lib/flow.h
index 5e78f7963..568e2919a 100644
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -78,19 +78,11 @@ struct flow {
     uint8_t reserved[2];        /* Reserved for 64-bit packing. */
 };
 
-/* Represents the metadata fields of struct flow.  The masks are used to
- * indicate which metadata fields are relevant in a given context.  Typically
- * they will be all 1 or all 0. */
+/* Represents the metadata fields of struct flow. */
 struct flow_metadata {
     ovs_be64 tun_id;                 /* Encapsulating tunnel ID. */
-    ovs_be64 tun_id_mask;            /* 1-bit in each significant tun_id bit.*/
-
-    ovs_be64 metadata;
-    ovs_be64 metadata_mask;
-
+    ovs_be64 metadata;               /* OpenFlow 1.1+ metadata field. */
     uint32_t regs[FLOW_N_REGS];      /* Registers. */
-    uint32_t reg_masks[FLOW_N_REGS]; /* 1-bit in each significant regs bit. */
-
     uint16_t in_port;                /* OpenFlow port or zero. */
 };