From 30ef36c6dbc77f91ee63ccd177b2db236270ab66 Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Tue, 24 Nov 2015 10:01:23 -0800 Subject: [PATCH] openflow: Remove OFPG11_* Protocol-independent symbols OFPG_* were already defined in openflow-common.h, so remove the protocol version dependent symbols. Found by inspection. Signed-off-by: Jarno Rajahalme Acked-by: Ben Pfaff --- include/openflow/openflow-1.1.h | 18 ++---------------- lib/ofp-parse.c | 4 ++-- lib/ofp-print.c | 2 +- lib/ofp-util.c | 22 +++++++++++----------- ofproto/ofproto.c | 4 ++-- utilities/ovs-ofctl.c | 2 +- 6 files changed, 19 insertions(+), 33 deletions(-) diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h index 5b4ba2b91..361150ad9 100644 --- a/include/openflow/openflow-1.1.h +++ b/include/openflow/openflow-1.1.h @@ -336,7 +336,7 @@ struct ofp11_flow_mod { indicates no restriction. */ ovs_be32 out_group; /* For OFPFC_DELETE* commands, require matching entries to include this as an - output group. A value of OFPG11_ANY + output group. A value of OFPG_ANY indicates no restriction. */ ovs_be16 flags; /* One of OFPFF_*. */ ovs_be16 importance; /* Eviction precedence (OF1.4+). */ @@ -354,20 +354,6 @@ enum ofp11_group_type { OFPGT11_FF /* Fast failover group. */ }; -/* Group numbering. Groups can use any number up to OFPG_MAX. */ -enum ofp11_group { - /* Last usable group number. */ - OFPG11_MAX = 0xffffff00, - - /* Fake groups. */ - OFPG11_ALL = 0xfffffffc, /* Represents all groups for group delete - commands. */ - OFPG11_ANY = 0xffffffff /* Wildcard group used only for flow stats - requests. Selects all flows regardless - of group (including flows with no - group). */ -}; - /* Bucket for use in groups. */ struct ofp11_bucket { ovs_be16 len; /* Length the bucket in bytes, including @@ -425,7 +411,7 @@ struct ofp11_flow_stats_request { as an output port. A value of OFPP_ANY indicates no restriction. */ ovs_be32 out_group; /* Require matching entries to include this - as an output group. A value of OFPG11_ANY + as an output group. A value of OFPG_ANY indicates no restriction. */ uint8_t pad2[4]; /* Align to 64 bits. */ ovs_be64 cookie; /* Require matching entries to contain this diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 214cc36a8..fe372cb7f 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -351,7 +351,7 @@ parse_ofp_str__(struct ofputil_flow_mod *fm, int command, char *string, fm->out_port = OFPP_ANY; fm->flags = 0; fm->importance = 0; - fm->out_group = OFPG11_ANY; + fm->out_group = OFPG_ANY; fm->delete_reason = OFPRR_DELETE; if (fields & F_ACTIONS) { act_str = extract_actions(string); @@ -1165,7 +1165,7 @@ parse_bucket_str(struct ofputil_bucket *bucket, char *str_, uint8_t group_type, bucket->weight = group_type == OFPGT11_SELECT ? 1 : 0; bucket->bucket_id = OFPG15_BUCKET_ALL; bucket->watch_port = OFPP_ANY; - bucket->watch_group = OFPG11_ANY; + bucket->watch_group = OFPG_ANY; ds_init(&actions); diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 240ba8452..9451e7a46 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -2385,7 +2385,7 @@ ofp_print_group(struct ds *s, uint32_t group_id, uint8_t type, if (bucket->watch_port != OFPP_NONE) { ds_put_format(s, "watch_port:%"PRIu32",", bucket->watch_port); } - if (bucket->watch_group != OFPG11_ANY) { + if (bucket->watch_group != OFPG_ANY) { ds_put_format(s, "watch_group:%"PRIu32",", bucket->watch_group); } diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 342be5409..041a47026 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -1713,7 +1713,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, fm->out_group = (ofm->command == OFPFC_DELETE || ofm->command == OFPFC_DELETE_STRICT ? ntohl(ofm->out_group) - : OFPG11_ANY); + : OFPG_ANY); raw_flags = ofm->flags; } else { uint16_t command; @@ -1745,7 +1745,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, fm->importance = 0; fm->buffer_id = ntohl(ofm->buffer_id); fm->out_port = u16_to_ofp(ntohs(ofm->out_port)); - fm->out_group = OFPG11_ANY; + fm->out_group = OFPG_ANY; raw_flags = ofm->flags; } else if (raw == OFPRAW_NXT_FLOW_MOD) { /* Nicira extended flow_mod. */ @@ -1773,7 +1773,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, fm->importance = 0; fm->buffer_id = ntohl(nfm->buffer_id); fm->out_port = u16_to_ofp(ntohs(nfm->out_port)); - fm->out_group = OFPG11_ANY; + fm->out_group = OFPG_ANY; raw_flags = nfm->flags; } else { OVS_NOT_REACHED(); @@ -2334,7 +2334,7 @@ ofputil_decode_ofpst10_flow_request(struct ofputil_flow_stats_request *fsr, fsr->aggregate = aggregate; ofputil_match_from_ofp10_match(&ofsr->match, &fsr->match); fsr->out_port = u16_to_ofp(ntohs(ofsr->out_port)); - fsr->out_group = OFPG11_ANY; + fsr->out_group = OFPG_ANY; fsr->table_id = ofsr->table_id; fsr->cookie = fsr->cookie_mask = htonll(0); @@ -2385,7 +2385,7 @@ ofputil_decode_nxst_flow_request(struct ofputil_flow_stats_request *fsr, fsr->aggregate = aggregate; fsr->out_port = u16_to_ofp(ntohs(nfsr->out_port)); - fsr->out_group = OFPG11_ANY; + fsr->out_group = OFPG_ANY; fsr->table_id = nfsr->table_id; return 0; @@ -6482,9 +6482,9 @@ bool ofputil_group_from_string(const char *s, uint32_t *group_idp) { if (!strcasecmp(s, "any")) { - *group_idp = OFPG11_ANY; + *group_idp = OFPG_ANY; } else if (!strcasecmp(s, "all")) { - *group_idp = OFPG11_ALL; + *group_idp = OFPG_ALL; } else if (!str_to_uint(s, 10, group_idp)) { VLOG_WARN("%s is not a valid group ID. (Valid group IDs are " "32-bit nonnegative integers or the keywords ANY or " @@ -6497,7 +6497,7 @@ ofputil_group_from_string(const char *s, uint32_t *group_idp) /* Appends to 's' a string representation of the OpenFlow group ID 'group_id'. * Most groups' string representation is just the number, but for special - * groups, e.g. OFPG11_ALL, it is the name, e.g. "ALL". */ + * groups, e.g. OFPG_ALL, it is the name, e.g. "ALL". */ void ofputil_format_group(uint32_t group_id, struct ds *s) { @@ -6510,18 +6510,18 @@ ofputil_format_group(uint32_t group_id, struct ds *s) /* Puts in the 'bufsize' byte in 'namebuf' a null-terminated string * representation of OpenFlow group ID 'group_id'. Most group are represented - * as just their number, but special groups, e.g. OFPG11_ALL, are represented + * as just their number, but special groups, e.g. OFPG_ALL, are represented * by name, e.g. "ALL". */ void ofputil_group_to_string(uint32_t group_id, char namebuf[MAX_GROUP_NAME_LEN + 1], size_t bufsize) { switch (group_id) { - case OFPG11_ALL: + case OFPG_ALL: ovs_strlcpy(namebuf, "ALL", bufsize); break; - case OFPG11_ANY: + case OFPG_ANY: ovs_strlcpy(namebuf, "ANY", bufsize); break; diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 2cdc8d428..28b2c0350 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -4929,7 +4929,7 @@ modify_flows_start_loose(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) enum ofperr error; rule_criteria_init(&criteria, fm->table_id, &fm->match, 0, CLS_MAX_VERSION, - fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG11_ANY); + fm->cookie, fm->cookie_mask, OFPP_ANY, OFPG_ANY); rule_criteria_require_rw(&criteria, (fm->flags & OFPUTIL_FF_NO_READONLY) != 0); error = collect_rules_loose(ofproto, &criteria, old_rules); @@ -5006,7 +5006,7 @@ modify_flow_start_strict(struct ofproto *ofproto, struct ofproto_flow_mod *ofm) rule_criteria_init(&criteria, fm->table_id, &fm->match, fm->priority, CLS_MAX_VERSION, fm->cookie, fm->cookie_mask, OFPP_ANY, - OFPG11_ANY); + OFPG_ANY); rule_criteria_require_rw(&criteria, (fm->flags & OFPUTIL_FF_NO_READONLY) != 0); error = collect_rules_strict(ofproto, &criteria, old_rules); diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 1cb3a0b85..869057525 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -2383,7 +2383,7 @@ ofctl_dump_group_desc(struct ovs_cmdl_context *ctx) open_vconn(ctx->argv[1], &vconn); if (ctx->argc < 3 || !ofputil_group_from_string(ctx->argv[2], &group_id)) { - group_id = OFPG11_ALL; + group_id = OFPG_ALL; } request = ofputil_encode_group_desc_request(vconn_get_version(vconn), -- 2.20.1