summaryrefslogtreecommitdiff
path: root/lib/flow.h
diff options
context:
space:
mode:
authorEthan Jackson <ethan@nicira.com>2010-12-03 15:43:24 -0800
committerEthan Jackson <ethan@nicira.com>2010-12-03 15:52:59 -0800
commit29b639ed7522594dac03bd10ad477f2f188ce4b6 (patch)
treeacaa9f470e471bc24185f92c4ae1a6eee8ac35c9 /lib/flow.h
parent7237e4f4b6155eb4854cebc0a45fe845f0950b40 (diff)
downloadopenvswitch-29b639ed7522594dac03bd10ad477f2f188ce4b6.tar.gz
lib: Add zero padding field to flow_wildcards.
Before this commit, the compiler would add two bytes of padding to the 'flow_wildcards' structure to achieve 32bit alignment. These two bytes had inconsistent values which caused 'flow_wildcards_hash' to behave inconsistently. This commit explicitly 32bit aligns 'flow_wildcards' with zero padding. This commit also fixes an issue where in-band rules were not getting deleted when in-band control was disabled.
Diffstat (limited to 'lib/flow.h')
-rw-r--r--lib/flow.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/flow.h b/lib/flow.h
index fd3246b6a..1509a7d12 100644
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -124,6 +124,7 @@ struct flow_wildcards {
ovs_be32 nw_src_mask; /* 1-bit in each significant nw_src bit. */
ovs_be32 nw_dst_mask; /* 1-bit in each significant nw_dst bit. */
ovs_be16 vlan_tci_mask; /* 1-bit in each significant vlan_tci bit. */
+ uint16_t zero; /* Padding field set to zero. */
};
void flow_wildcards_init_catchall(struct flow_wildcards *);