| Message ID | 20180221145729.4892-1-aserdean@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] datapath-windows: fix hash creation on ct mark | expand |
On Wed, Feb 21, 2018 at 04:57:29PM +0200, Alin Gabriel Serdean wrote: > Use key->ct.mark instead of key->ct.zone when generating the hash > over the mark. > > Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> Seems obviously correct. Acked-by: Ben Pfaff <blp@ovn.org>
Acked-by: Anand Kumar <kumaranand@vmware.com> Thanks, Anand Kumar On 2/21/18, 6:57 AM, "ovs-dev-bounces@openvswitch.org on behalf of Alin Gabriel Serdean" <ovs-dev-bounces@openvswitch.org on behalf of aserdean@ovn.org> wrote: Use key->ct.mark instead of key->ct.zone when generating the hash over the mark. Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> --- datapath-windows/ovsext/Flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c index bc42714c2..e64d00b8b 100644 --- a/datapath-windows/ovsext/Flow.c +++ b/datapath-windows/ovsext/Flow.c @@ -2571,7 +2571,7 @@ OvsLookupFlow(OVS_DATAPATH *datapath, *hash = OvsJhashWords((UINT32*)hash, 1, key->ct.zone); } if (key->ct.mark) { - *hash = OvsJhashWords((UINT32*)hash, 1, key->ct.zone); + *hash = OvsJhashWords((UINT32*)hash, 1, key->ct.mark); } if (key->ct.labels.ct_labels) { UINT32 lblHash = OvsJhashBytes(&key->ct.labels, -- 2.16.1.windows.1 _______________________________________________ dev mailing list dev@openvswitch.org https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=Q5z9tBe-nAOpE7LIHSPV8uy5-437agMXvkeHHMkR8Us&m=jef6IDqHh9tL43XOTWwHKdgkCxn1X6N3XtIaWuSxLkc&s=1HTVWmRloxt1Kzck2vYlu8ZjLpkimoLbkNL0rZopyvc&e=
Thanks Ben and Anand. I applied from master to branch-2.6. Thanks, Alin. -----Mesaj original----- De la: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev-bounces@openvswitch.org] În numele Ben Pfaff Trimis: Wednesday, February 21, 2018 8:41 PM Către: Alin Gabriel Serdean <aserdean@ovn.org> Cc: dev@openvswitch.org Subiect: Re: [ovs-dev] [PATCH] datapath-windows: fix hash creation on ct mark On Wed, Feb 21, 2018 at 04:57:29PM +0200, Alin Gabriel Serdean wrote: > Use key->ct.mark instead of key->ct.zone when generating the hash over > the mark. > > Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> Seems obviously correct. Acked-by: Ben Pfaff <blp@ovn.org>
diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c index bc42714c2..e64d00b8b 100644 --- a/datapath-windows/ovsext/Flow.c +++ b/datapath-windows/ovsext/Flow.c @@ -2571,7 +2571,7 @@ OvsLookupFlow(OVS_DATAPATH *datapath, *hash = OvsJhashWords((UINT32*)hash, 1, key->ct.zone); } if (key->ct.mark) { - *hash = OvsJhashWords((UINT32*)hash, 1, key->ct.zone); + *hash = OvsJhashWords((UINT32*)hash, 1, key->ct.mark); } if (key->ct.labels.ct_labels) { UINT32 lblHash = OvsJhashBytes(&key->ct.labels,
Use key->ct.mark instead of key->ct.zone when generating the hash over the mark. Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org> --- datapath-windows/ovsext/Flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)