From patchwork Wed Feb 21 14:57:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 876145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zmgZd5jHDz9sDQ for ; Thu, 22 Feb 2018 01:57:45 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4F1981228; Wed, 21 Feb 2018 14:57:44 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id CCC78121A for ; Wed, 21 Feb 2018 14:57:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 30A1044D for ; Wed, 21 Feb 2018 14:57:42 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 6C14741C0CC; Wed, 21 Feb 2018 15:57:40 +0100 (CET) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Wed, 21 Feb 2018 16:57:29 +0200 Message-Id: <20180221145729.4892-1-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH] datapath-windows: fix hash creation on ct mark X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Use key->ct.mark instead of key->ct.zone when generating the hash over the mark. Signed-off-by: Alin Gabriel Serdean Acked-by: Ben Pfaff Acked-by: Anand Kumar Acked-by: Ben Pfaff --- 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,