| Message ID | 1501533339-126553-2-git-send-email-yihung.wei@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
On 31 July 2017 at 13:35, Yi-Hung Wei <yihung.wei@gmail.com> wrote: > Previsouly, odp_key_to_dp_packet() may fail to get ct_state, ct_zone, > ct_mark, and ct_labels from ODP flow key. This patch fixes the issue. > > VMWare-BZ: #1920903 > Fixes: 07659514c3c1 ("Add support for connection tracking.") > Fixes: 8e53fe8cf7a1 ("Add connection tracking mark support.") > Fixes: 9daf23484fb1 ("Add connection tracking label support.") > Suggested-by: Joe Stringer <joe@ovn.org> > Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com> > --- Thanks, I backported this to branches 2.5-2.7.
diff --git a/lib/odp-util.c b/lib/odp-util.c index 1c6fb38e12ac..cf0d39d9ec16 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -4788,7 +4788,9 @@ odp_key_to_dp_packet(const struct nlattr *key, size_t key_len, uint32_t wanted_attrs = 1u << OVS_KEY_ATTR_PRIORITY | 1u << OVS_KEY_ATTR_SKB_MARK | 1u << OVS_KEY_ATTR_TUNNEL | 1u << OVS_KEY_ATTR_IN_PORT | 1u << OVS_KEY_ATTR_ETHERTYPE | - 1u << OVS_KEY_ATTR_ETHERNET; + 1u << OVS_KEY_ATTR_ETHERNET | 1u << OVS_KEY_ATTR_CT_STATE | + 1u << OVS_KEY_ATTR_CT_ZONE | 1u << OVS_KEY_ATTR_CT_MARK | + 1u << OVS_KEY_ATTR_CT_LABELS; pkt_metadata_init(md, ODPP_NONE);
Previsouly, odp_key_to_dp_packet() may fail to get ct_state, ct_zone, ct_mark, and ct_labels from ODP flow key. This patch fixes the issue. VMWare-BZ: #1920903 Fixes: 07659514c3c1 ("Add support for connection tracking.") Fixes: 8e53fe8cf7a1 ("Add connection tracking mark support.") Fixes: 9daf23484fb1 ("Add connection tracking label support.") Suggested-by: Joe Stringer <joe@ovn.org> Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com> --- lib/odp-util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)