From 644cfd84772eb7d83dfff9153b9e8851cbe1fec2 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Thu, 10 Apr 2014 00:48:18 -0700 Subject: [PATCH] openflow-1.1.h: improve struct ofp11_group_stats definition Uncomment bucket_stats definition in struct ofp11_group_stats to better match OpenFlow spec 1.1's definition on page 48. Signed-off-by: Andy Zhou Acked-by: Ben Pfaff --- include/openflow/openflow-1.1.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h index 92dd3c5e5..e3e2d39f7 100644 --- a/include/openflow/openflow-1.1.h +++ b/include/openflow/openflow-1.1.h @@ -688,6 +688,13 @@ struct ofp11_group_stats_request { }; OFP_ASSERT(sizeof(struct ofp11_group_stats_request) == 8); +/* Used in group stats replies. */ +struct ofp11_bucket_counter { + ovs_be64 packet_count; /* Number of packets processed by bucket. */ + ovs_be64 byte_count; /* Number of bytes processed by bucket. */ +}; +OFP_ASSERT(sizeof(struct ofp11_bucket_counter) == 16); + /* Body of reply to OFPST11_GROUP request */ struct ofp11_group_stats { ovs_be16 length; /* Length of this entry. */ @@ -698,18 +705,10 @@ struct ofp11_group_stats { uint8_t pad2[4]; /* Align to 64 bits. */ ovs_be64 packet_count; /* Number of packets processed by group. */ ovs_be64 byte_count; /* Number of bytes processed by group. */ - /* struct ofp11_bucket_counter bucket_stats[0]; */ - + struct ofp11_bucket_counter bucket_stats[0]; }; OFP_ASSERT(sizeof(struct ofp11_group_stats) == 32); -/* Used in group stats replies. */ -struct ofp11_bucket_counter { - ovs_be64 packet_count; /* Number of packets processed by bucket. */ - ovs_be64 byte_count; /* Number of bytes processed by bucket. */ -}; -OFP_ASSERT(sizeof(struct ofp11_bucket_counter) == 16); - /* Body of reply to OFPST11_GROUP_DESC request. */ struct ofp11_group_desc_stats { ovs_be16 length; /* Length of this entry. */ -- 2.43.0