diff options
| author | Simon Horman <simon.horman@netronome.com> | 2014-11-21 10:16:23 +0900 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-11-25 08:14:10 -0800 |
| commit | 7987096335862b741d99d52f408be1023ba44eb7 (patch) | |
| tree | dd9edbe27a9759ac8c7904481524ff0df224b6a4 /include/openflow | |
| parent | b3248fa7ca8fe322e60fb588ea546074d8376cd6 (diff) | |
| download | openvswitch-7987096335862b741d99d52f408be1023ba44eb7.tar.gz | |
openflow: Use *_array_len names in struct ofp15_bucket and ofp15_group_mod
The spec has been clarified to use _list_len in palce of _list_len
terminology to make it clearer that the data is not an ordered list
(it is a set). The code present in Open vSwitch already avoided
the _list_len terminology. This change brings the code into
line with the updated spec.
ONF-JIRA: EXT-350
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'include/openflow')
| -rw-r--r-- | include/openflow/openflow-1.5.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/openflow/openflow-1.5.h b/include/openflow/openflow-1.5.h index 5183125b4..4d778181b 100644 --- a/include/openflow/openflow-1.5.h +++ b/include/openflow/openflow-1.5.h @@ -85,11 +85,11 @@ struct ofp15_bucket { ovs_be16 len; /* Length the bucket in bytes, including this header and any padding to make it 64-bit aligned. */ - ovs_be16 actions_len; /* Length of all actions in bytes. */ + ovs_be16 action_array_len; /* Length of all actions in bytes. */ ovs_be32 bucket_id; /* Bucket Id used to identify bucket*/ /* Followed by exactly len - 8 bytes of group bucket properties. */ /* Followed by: - * - Exactly 'actions_len' bytes containing an array of + * - Exactly 'action_array_len' bytes containing an array of * struct ofp_action_*. * - Zero or more bytes of group bucket properties to fill out the * overall length in header.length. */ @@ -123,14 +123,14 @@ struct ofp15_group_mod { uint8_t type; /* One of OFPGT11_*. */ uint8_t pad; /* Pad to 64 bits. */ ovs_be32 group_id; /* Group identifier. */ - ovs_be16 bucket_list_len; /* Length of action buckets data. */ + ovs_be16 bucket_array_len; /* Length of action buckets data. */ uint8_t pad1[2]; /* Pad to 64 bits. */ ovs_be32 command_bucket_id; /* Bucket Id used as part of * OFPGC15_INSERT_BUCKET and * OFPGC15_REMOVE_BUCKET commands * execution.*/ /* Followed by: - * - Exactly 'bucket_list_len' bytes containing an array of + * - Exactly 'bucket_array_len' bytes containing an array of * struct ofp15_bucket. * - Zero or more bytes of group properties to fill out the overall * length in header.length. */ |