datapath: Eliminate 'flags' member from odp_flow.

Nothing was productively using the 'flags' member of odp_flow, so this
commit removes it.

ODPFF_ZERO_TCP_FLAGS isn't used at all (as of the previous commit).

ODPFF_EOF has been replaced by a special case of the 'key_len' member.
This will go away, too, once AF_NETLINK starts being used.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index 54c39d1ff..0078874ff 100644
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -271,17 +271,12 @@ struct odp_key_arp {
 	ovs_be16 arp_op;
 };
 
-/* Flags for ODP_FLOW. */
-#define ODPFF_ZERO_TCP_FLAGS (1 << 0) /* Zero the TCP flags. */
-#define ODPFF_EOF            (1 << 1) /* ODP_FLOW_DUMP: end of flow table. */
-
 struct odp_flow {
     struct odp_flow_stats stats;
     struct nlattr *key;
     uint32_t key_len;
     struct nlattr *actions;
     uint32_t actions_len;
-    uint32_t flags;
 };
 
 /* Flags for ODP_FLOW_PUT. */
@@ -298,9 +293,9 @@ struct odp_flow_put {
 /* ODP_FLOW_DUMP argument.
  *
  * This is used to iterate through the flow table flow-by-flow.  Each
- * ODP_FLOW_DUMP call either stores a new odp_flow into 'flow' or stores
- * ODPFF_EOF into flow->flags to indicate that the end of the table has been
- * reaches, and updates 'state' in-place.
+ * ODP_FLOW_DUMP call either stores a new odp_flow into 'flow' or stores 0 into
+ * flow->key_len to indicate that the end of the table has been reached, and
+ * updates 'state' in-place.
  *
  * Before the first call, zero 'state'.  The format of 'state' is otherwise
  * unspecified.