2
0
mirror of https://github.com/openvswitch/ovs synced 2025-10-23 14:57:06 +00:00

openflow: Merge ofp_flow_stats_request and ofp_aggregate_stats_request.

This commit is contained in:
Ben Pfaff
2011-05-23 16:07:22 -07:00
parent 03cd34939e
commit 2a1c0549a3
3 changed files with 4 additions and 19 deletions

View File

@@ -512,7 +512,7 @@ ofputil_decode_ofpst_request(const struct ofp_header *oh,
{ OFPUTIL_OFPST_AGGREGATE_REQUEST,
OFPST_AGGREGATE, "OFPST_AGGREGATE request",
OSM_SIZE + sizeof(struct ofp_aggregate_stats_request), 0 },
OSM_SIZE + sizeof(struct ofp_flow_stats_request), 0 },
{ OFPUTIL_OFPST_TABLE_REQUEST,
OFPST_TABLE, "OFPST_TABLE request",
@@ -1099,9 +1099,6 @@ ofputil_encode_flow_stats_request(const struct flow_stats_request *fsr,
struct ofp_flow_stats_request *ofsr;
int type;
BUILD_ASSERT_DECL(sizeof(struct ofp_flow_stats_request)
== sizeof(struct ofp_aggregate_stats_request));
type = fsr->aggregate ? OFPST_AGGREGATE : OFPST_FLOW;
ofsr = ofputil_make_stats_request(sizeof *ofsr, type, &msg);
ofputil_cls_rule_to_match(&fsr->match, &ofsr->match);