mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 07:45:30 +00:00
Code Issues Releases Wiki Activity

lib/ofp: Consolidate some struct field orders

Browse Source 
Avoid "holes" in structs by moving "small" members together.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Helmut Schaa
2013-12-13 14:17:13 +01:00
committed by Ben Pfaff
parent ac0bdaa330
commit e082203124
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ofp-actions.h
View File

@@ -494,9 +494,9 @@ struct ofpact_learn {
uint16_t idle_timeout; /* Idle time before discarding (seconds). */
uint16_t hard_timeout; /* Max time before discarding (seconds). */
uint16_t priority; /* Priority level of flow entry. */
uint8_t table_id; /* Table to insert flow entry. */
uint64_t cookie; /* Cookie for new flow. */
enum ofputil_flow_mod_flags flags;
uint8_t table_id; /* Table to insert flow entry. */
uint16_t fin_idle_timeout; /* Idle timeout after FIN, if nonzero. */
uint16_t fin_hard_timeout; /* Hard timeout after FIN, if nonzero. */

8
lib/ofp-util.h
View File

@@ -321,11 +321,11 @@ struct ofputil_flow_stats {
struct match match;
ovs_be64 cookie;
uint8_t table_id;
uint32_t duration_sec;
uint32_t duration_nsec;
uint16_t priority;
uint16_t idle_timeout;
uint16_t hard_timeout;
uint32_t duration_sec;
uint32_t duration_nsec;
int idle_age; /* Seconds since last packet, -1 if unknown. */
int hard_age; /* Seconds since last change, -1 if unknown. */
uint64_t packet_count; /* Packet count, UINT64_MAX if unknown. */
@@ -359,8 +359,8 @@ enum ofperr ofputil_decode_aggregate_stats_reply(
/* Flow removed message, independent of protocol. */
struct ofputil_flow_removed {
struct match match;
uint16_t priority;
ovs_be64 cookie;
uint16_t priority;
uint8_t reason; /* One of OFPRR_*. */
uint8_t table_id; /* 255 if message didn't include table ID. */
uint32_t duration_sec;
@@ -770,9 +770,9 @@ struct ofputil_flow_update {
uint16_t idle_timeout;
uint16_t hard_timeout;
uint8_t table_id;
uint16_t priority;
ovs_be64 cookie;
struct match *match;
uint16_t priority;
struct ofpact *ofpacts;
size_t ofpacts_len;