ofp-prop: Add generic functions for working with 16- and 32-bit properties.

These will see increasing use in upcoming commits.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>

1 files changed, 0 insertions, 18 deletions

diff --git a/include/openflow/openflow-1.5.h b/include/openflow/openflow-1.5.h
index b3deb2d27..0c478d1f0 100644
--- a/include/openflow/openflow-1.5.h
+++ b/include/openflow/openflow-1.5.h
@@ -69,24 +69,6 @@ enum ofp15_group_bucket_prop_type {
     OFPGBPT15_EXPERIMENTER      = 0xFFFF,  /* Experimenter defined. */
 };
 
-/* Group bucket weight property, for select groups only. */
-struct ofp15_group_bucket_prop_weight {
-    ovs_be16         type;    /* OFPGBPT15_WEIGHT. */
-    ovs_be16         length;  /* 8. */
-    ovs_be16         weight;  /* Relative weight of bucket. */
-    uint8_t          pad[2];  /* Pad to 64 bits. */
-};
-OFP_ASSERT(sizeof(struct ofp15_group_bucket_prop_weight) == 8);
-
-/* Group bucket watch port or watch group property, for fast failover groups
- * only. */
-struct ofp15_group_bucket_prop_watch {
-    ovs_be16         type;    /* OFPGBPT15_WATCH_PORT or OFPGBPT15_WATCH_GROUP. */
-    ovs_be16         length;  /* 8. */
-    ovs_be32         watch;   /* The port or the group.  */
-};
-OFP_ASSERT(sizeof(struct ofp15_group_bucket_prop_watch) == 8);
-
 /* Bucket for use in groups. */
 struct ofp15_bucket {
     ovs_be16 len;                   /* Length the bucket in bytes, including