diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2015-11-24 10:01:23 -0800 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2015-11-24 10:01:23 -0800 |
| commit | 30ef36c6dbc77f91ee63ccd177b2db236270ab66 (patch) | |
| tree | d93e6e3fb2cdb4d3f88f520760672b960ac21b40 /include | |
| parent | 30529698ba32515e066fd704a5c1966a857852c3 (diff) | |
| download | openvswitch-30ef36c6dbc77f91ee63ccd177b2db236270ab66.tar.gz | |
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 <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openflow/openflow-1.1.h | 18 |
1 files changed, 2 insertions, 16 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 |