From patchwork Mon Jul 9 13:40:43 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: 941280 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRM64jf8z9s01 for ; Mon, 9 Jul 2018 23:41:38 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9FA84CC9; Mon, 9 Jul 2018 13:41:10 +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 3CAA7C7A for ; Mon, 9 Jul 2018 13:41:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7376667E for ; Mon, 9 Jul 2018 13:41:08 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 8AA2B1BF219; Mon, 9 Jul 2018 13:41:06 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:43 +0300 Message-Id: <20180709134056.7060-2-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 01/14] datapath-windows: Cleanup Actions.c 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 Assign variables directly instead of reassigning them after. Also purge unused variable `PNL_ATTR queueAttr`. Signed-off-by: Alin Gabriel Serdean Acked-by: Shashank Ram --- datapath-windows/ovsext/Actions.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c index 6922f0593..860d0abfa 100644 --- a/datapath-windows/ovsext/Actions.c +++ b/datapath-windows/ovsext/Actions.c @@ -152,11 +152,10 @@ OvsInitForwardingCtx(OvsForwardingContext *ovsFwdCtx, static __inline VOID OvsDoFragmentNbl(OvsForwardingContext *ovsFwdCtx, UINT16 mru) { - PNET_BUFFER_LIST fragNbl = NULL; - fragNbl = OvsFragmentNBL(ovsFwdCtx->switchContext, - ovsFwdCtx->curNbl, - &(ovsFwdCtx->layers), - mru, 0, TRUE); + PNET_BUFFER_LIST fragNbl = OvsFragmentNBL(ovsFwdCtx->switchContext, + ovsFwdCtx->curNbl, + &(ovsFwdCtx->layers), + mru, 0, TRUE); if (fragNbl != NULL) { OvsCompleteNBL(ovsFwdCtx->switchContext, ovsFwdCtx->curNbl, TRUE); @@ -688,11 +687,11 @@ OvsTunnelPortTx(OvsForwardingContext *ovsFwdCtx) OvsCompleteNBLForwardingCtx(ovsFwdCtx, L"Complete after cloning NBL for encapsulation"); - status = OvsInitForwardingCtx(ovsFwdCtx, ovsFwdCtx->switchContext, - newNbl, srcVportNo, 0, - NET_BUFFER_LIST_SWITCH_FORWARDING_DETAIL(newNbl), - ovsFwdCtx->completionList, - &ovsFwdCtx->layers, FALSE); + OvsInitForwardingCtx(ovsFwdCtx, ovsFwdCtx->switchContext, + newNbl, srcVportNo, 0, + NET_BUFFER_LIST_SWITCH_FORWARDING_DETAIL(newNbl), + ovsFwdCtx->completionList, + &ovsFwdCtx->layers, FALSE); ovsFwdCtx->curNbl = newNbl; /* Update the forwarding detail for the new NBL */ ovsFwdCtx->fwdDetail->SourcePortId = srcPortId; @@ -1815,7 +1814,6 @@ OvsOutputUserspaceAction(OvsForwardingContext *ovsFwdCtx, { NTSTATUS status = NDIS_STATUS_SUCCESS; PNL_ATTR userdataAttr; - PNL_ATTR queueAttr; POVS_PACKET_QUEUE_ELEM elem; POVS_PACKET_HDR_INFO layers = &ovsFwdCtx->layers; BOOLEAN isRecv = FALSE; @@ -1830,7 +1828,6 @@ OvsOutputUserspaceAction(OvsForwardingContext *ovsFwdCtx, } } - queueAttr = NlAttrFindNested(attr, OVS_USERSPACE_ATTR_PID); userdataAttr = NlAttrFindNested(attr, OVS_USERSPACE_ATTR_USERDATA); elem = OvsCreateQueueNlPacket(NlAttrData(userdataAttr), @@ -2361,13 +2358,12 @@ OvsDoRecirc(POVS_SWITCH_CONTEXT switchContext, OvsDeferredActionsLevelDec(); } else { - POVS_VPORT_ENTRY vport = NULL; + POVS_VPORT_ENTRY vport = OvsFindVportByPortNo(switchContext, srcPortNo); LIST_ENTRY missedPackets; UINT32 num = 0; ovsFwdCtx.switchContext->datapath.misses++; InitializeListHead(&missedPackets); - vport = OvsFindVportByPortNo(switchContext, srcPortNo); if (vport == NULL || vport->ovsState != OVS_STATE_CONNECTED) { OvsCompleteNBLForwardingCtx(&ovsFwdCtx, L"OVS-Dropped due to port removal"); From patchwork Mon Jul 9 13:40:44 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: 941281 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRMl0PH1z9s01 for ; Mon, 9 Jul 2018 23:42:10 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6A5A8D69; Mon, 9 Jul 2018 13:41:11 +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 BA4C4C9E for ; Mon, 9 Jul 2018 13:41:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 38644E2 for ; Mon, 9 Jul 2018 13:41:08 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 5EF281BF21A; Mon, 9 Jul 2018 13:41:07 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:44 +0300 Message-Id: <20180709134056.7060-3-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 02/14] datapath-windows: Cleanup BufferMgmt.c 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 Assign variables directly instead of reassigning them after. Signed-off-by: Alin Gabriel Serdean Acked-by: Shashank Ram --- datapath-windows/ovsext/BufferMgmt.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/datapath-windows/ovsext/BufferMgmt.c b/datapath-windows/ovsext/BufferMgmt.c index 448cd7652..0f1c705d2 100644 --- a/datapath-windows/ovsext/BufferMgmt.c +++ b/datapath-windows/ovsext/BufferMgmt.c @@ -1163,12 +1163,9 @@ FixFragmentHeader(PNET_BUFFER nb, UINT16 fragmentSize, BOOLEAN lastPacket, UINT16 offset) { EthHdr *dstEth = NULL; - PMDL mdl = NULL; - PUINT8 bufferStart = NULL; + PMDL mdl = NET_BUFFER_FIRST_MDL(nb); + PUINT8 bufferStart = (PUINT8)OvsGetMdlWithLowPriority(mdl); - mdl = NET_BUFFER_FIRST_MDL(nb); - - bufferStart = (PUINT8)OvsGetMdlWithLowPriority(mdl); if (!bufferStart) { return NDIS_STATUS_RESOURCES; } @@ -1221,12 +1218,9 @@ FixSegmentHeader(PNET_BUFFER nb, UINT16 segmentSize, UINT32 seqNumber, { EthHdr *dstEth = NULL; TCPHdr *dstTCP = NULL; - PMDL mdl = NULL; - PUINT8 bufferStart = NULL; - - mdl = NET_BUFFER_FIRST_MDL(nb); + PMDL mdl = NET_BUFFER_FIRST_MDL(nb); + PUINT8 bufferStart = (PUINT8)OvsGetMdlWithLowPriority(mdl); - bufferStart = (PUINT8)OvsGetMdlWithLowPriority(mdl); if (!bufferStart) { return NDIS_STATUS_RESOURCES; } From patchwork Mon Jul 9 13:40:45 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: 941283 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRNQ5bzbz9s01 for ; Mon, 9 Jul 2018 23:42:46 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 3A71CD70; Mon, 9 Jul 2018 13:41:12 +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 4B6FBCBD for ; Mon, 9 Jul 2018 13:41:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C4F21E2 for ; Mon, 9 Jul 2018 13:41:09 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 0CFC51BF21C; Mon, 9 Jul 2018 13:41:07 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:45 +0300 Message-Id: <20180709134056.7060-4-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 03/14] datapath-windows: Cleanup Conntrack.c 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 Do not assign an initial value for the variable `entry`, it will be reassigned later on. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Conntrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath-windows/ovsext/Conntrack.c b/datapath-windows/ovsext/Conntrack.c index dd1660218..0fa35fed7 100644 --- a/datapath-windows/ovsext/Conntrack.c +++ b/datapath-windows/ovsext/Conntrack.c @@ -841,7 +841,7 @@ OvsCtExecute_(OvsForwardingContext *fwdCtx, NDIS_STATUS status = NDIS_STATUS_SUCCESS; BOOLEAN triggerUpdateEvent = FALSE; BOOLEAN entryCreated = FALSE; - POVS_CT_ENTRY entry = NULL; + POVS_CT_ENTRY entry; PNET_BUFFER_LIST curNbl = fwdCtx->curNbl; OvsConntrackKeyLookupCtx ctx = { 0 }; LOCK_STATE_EX lockStateTable; From patchwork Mon Jul 9 13:40:46 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: 941284 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRNy2vf8z9s01 for ; Mon, 9 Jul 2018 23:43:14 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E5160D20; Mon, 9 Jul 2018 13:41:12 +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 F312DD2A for ; Mon, 9 Jul 2018 13:41:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 76F49E2 for ; Mon, 9 Jul 2018 13:41:10 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id AAC721BF211; Mon, 9 Jul 2018 13:41:08 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:46 +0300 Message-Id: <20180709134056.7060-5-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 04/14] datapath-windows: Cleanup Datapath.c 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 Assign variable directly instead of reassigning it after. Do not assign an initial value to `inputBuffer`, it will be assigned later on. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Datapath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c index 34ef2b40a..448558701 100644 --- a/datapath-windows/ovsext/Datapath.c +++ b/datapath-windows/ovsext/Datapath.c @@ -407,7 +407,7 @@ FreeUserDumpState(POVS_OPEN_INSTANCE instance) NDIS_STATUS OvsInit() { - NDIS_STATUS status = NDIS_STATUS_SUCCESS; + NDIS_STATUS status; gOvsCtrlLock = &ovsCtrlLockObj; NdisAllocateSpinLock(gOvsCtrlLock); @@ -720,7 +720,7 @@ OvsDeviceControl(PDEVICE_OBJECT deviceObject, PIO_STACK_LOCATION irpSp; NTSTATUS status = STATUS_SUCCESS; PFILE_OBJECT fileObject; - PVOID inputBuffer = NULL; + PVOID inputBuffer; PVOID outputBuffer = NULL; UINT32 inputBufferLen, outputBufferLen; UINT32 code, replyLen = 0; From patchwork Mon Jul 9 13:40:47 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: 941285 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRPS3gHnz9s01 for ; Mon, 9 Jul 2018 23:43:40 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id AE058DB6; Mon, 9 Jul 2018 13:41:13 +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 A8B9DD73 for ; Mon, 9 Jul 2018 13:41:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 2F7A2E2 for ; Mon, 9 Jul 2018 13:41:10 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 512881BF213; Mon, 9 Jul 2018 13:41:09 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:47 +0300 Message-Id: <20180709134056.7060-6-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 05/14] datapath-windows: Cleanup Gre.c 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 Do not assign an initial value to ` status`, it will be assigned later on. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath-windows/ovsext/Gre.c b/datapath-windows/ovsext/Gre.c index afdd5abe3..c95d089e4 100644 --- a/datapath-windows/ovsext/Gre.c +++ b/datapath-windows/ovsext/Gre.c @@ -318,7 +318,7 @@ OvsDecapGre(POVS_SWITCH_CONTEXT switchContext, UINT32 headRoom = 0; UINT32 maxGreLen; PUINT8 bufferStart; - NDIS_STATUS status = NDIS_STATUS_SUCCESS; + NDIS_STATUS status; PCHAR tempBuf = NULL; OVS_PACKET_HDR_INFO layers; From patchwork Mon Jul 9 13:40:48 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: 941286 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRPx72Jcz9s01 for ; Mon, 9 Jul 2018 23:44:05 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7155CDB7; Mon, 9 Jul 2018 13:41:14 +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 BE9FDD9A for ; Mon, 9 Jul 2018 13:41:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BE680E2 for ; Mon, 9 Jul 2018 13:41:11 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id F1C6F1BF21B; Mon, 9 Jul 2018 13:41:09 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:48 +0300 Message-Id: <20180709134056.7060-7-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 06/14] datapath-windows: Cleanup IpHelper.c 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 Assign variables directly instead of reassigning them after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/IpHelper.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c index 6bbd096c5..1ec10eb3d 100644 --- a/datapath-windows/ovsext/IpHelper.c +++ b/datapath-windows/ovsext/IpHelper.c @@ -368,11 +368,10 @@ OvsGetRoute(SOCKADDR_INET *destinationAddress, LIST_FORALL_SAFE(head, link, next) { SOCKADDR_INET crtSrcAddr = { 0 }; MIB_IPFORWARD_ROW2 crtRoute = { 0 }; - POVS_IPHELPER_INSTANCE crtInstance = NULL; + POVS_IPHELPER_INSTANCE crtInstance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); WCHAR interfaceName[IF_MAX_STRING_SIZE + 1]; - crtInstance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); - ExAcquireResourceExclusiveLite(&crtInstance->lock, TRUE); result = GetBestRoute2(&crtInstance->internalRow.InterfaceLuid, 0, NULL, destinationAddress, 0, &crtRoute, @@ -385,7 +384,6 @@ OvsGetRoute(SOCKADDR_INET *destinationAddress, if (minMetric > crtRoute.Metric && (!srcIp || srcIp == crtSrcAddr.Ipv4.sin_addr.S_un.S_addr)) { - status = STATUS_SUCCESS; size_t len = 0; minMetric = crtRoute.Metric; LOCK_STATE_EX lockState; @@ -538,9 +536,8 @@ OvsUpdateIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow) ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (OvsCheckInstanceRow(&instance->internalRow, @@ -578,9 +575,8 @@ OvsAddIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow) ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (OvsCheckInstanceRow(&instance->internalRow, &ipRow->InterfaceLuid, @@ -684,9 +680,8 @@ OvsRemoveIpInterfaceNotification(PMIB_IPINTERFACE_ROW ipRow) ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (OvsCheckInstanceRow(&instance->internalRow, &ipRow->InterfaceLuid, @@ -821,9 +816,8 @@ OvsChangeCallbackUnicastIpAddress(PVOID context, ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (instance->isIpConfigured && @@ -860,9 +854,8 @@ OvsChangeCallbackUnicastIpAddress(PVOID context, ExAcquireResourceExclusiveLite(&ovsInstanceListLock, TRUE); head = &(ovsInstanceList); LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); if (instance->isIpConfigured && @@ -1461,8 +1454,8 @@ OvsIpHelperDeleteAllInstances() head = &ovsInstanceList; if (!IsListEmpty(head)) { LIST_FORALL_SAFE(head, link, next) { - POVS_IPHELPER_INSTANCE instance = NULL; - instance = CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); + POVS_IPHELPER_INSTANCE instance = + CONTAINING_RECORD(link, OVS_IPHELPER_INSTANCE, link); ExAcquireResourceExclusiveLite(&instance->lock, TRUE); @@ -1985,11 +1978,10 @@ ip_helper_wait: NTSTATUS OvsInitIpHelper(NDIS_HANDLE ndisFilterHandle) { - NTSTATUS status = NDIS_STATUS_SUCCESS; + NTSTATUS status = ExInitializeResourceLite(&ovsInstanceListLock); HANDLE threadHandle; UINT32 i; - status = ExInitializeResourceLite(&ovsInstanceListLock); if (status != NDIS_STATUS_SUCCESS) { return status; } From patchwork Mon Jul 9 13:40:49 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: 941287 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRQR0Zbmz9s01 for ; Mon, 9 Jul 2018 23:44:31 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 400E6DC8; Mon, 9 Jul 2018 13:41:15 +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 F316EDB3 for ; Mon, 9 Jul 2018 13:41:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6483267E for ; Mon, 9 Jul 2018 13:41:12 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 9E2E11BF20C; Mon, 9 Jul 2018 13:41:10 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:49 +0300 Message-Id: <20180709134056.7060-8-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 07/14] datapath-windows: Cleanup Netlink.c 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 Assign variable directly instead of reassigning it after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Netlink/Netlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/datapath-windows/ovsext/Netlink/Netlink.c b/datapath-windows/ovsext/Netlink/Netlink.c index 156732cdb..718adba39 100644 --- a/datapath-windows/ovsext/Netlink/Netlink.c +++ b/datapath-windows/ovsext/Netlink/Netlink.c @@ -563,9 +563,7 @@ UINT32 NlMsgStartNested(PNL_BUFFER buf, UINT16 type) { UINT32 offset = NlBufSize(buf); - PCHAR nlaData = NULL; - - nlaData = NlMsgPutTailUnspecUninit(buf, type, 0); + PCHAR nlaData = NlMsgPutTailUnspecUninit(buf, type, 0); if (!nlaData) { /* Value zero must be reated as error by the caller. From patchwork Mon Jul 9 13:40:50 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: 941288 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRQt5cyTz9s01 for ; Mon, 9 Jul 2018 23:44:54 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0271ADC3; Mon, 9 Jul 2018 13:41:16 +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 8EB70DB3 for ; Mon, 9 Jul 2018 13:41:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1462BE2 for ; Mon, 9 Jul 2018 13:41:12 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 5B2DB1BF21C; Mon, 9 Jul 2018 13:41:11 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:50 +0300 Message-Id: <20180709134056.7060-9-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 08/14] datapath-windows: Cleanup NetlinkBuf.c 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 Assign variable directly instead of reassigning it after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Netlink/NetlinkBuf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/datapath-windows/ovsext/Netlink/NetlinkBuf.c b/datapath-windows/ovsext/Netlink/NetlinkBuf.c index 639b6e50d..6722a55b8 100644 --- a/datapath-windows/ovsext/Netlink/NetlinkBuf.c +++ b/datapath-windows/ovsext/Netlink/NetlinkBuf.c @@ -334,9 +334,7 @@ static __inline VOID _NlBufCopyAtOffsetUnsafe(PNL_BUFFER nlBuf, PCHAR data, UINT32 len, UINT32 offset) { - PCHAR dest = NULL; - - dest = nlBuf->head + offset; + PCHAR dest = nlBuf->head + offset; RtlMoveMemory(dest+len, dest, NL_BUF_USED_SPACE(nlBuf) - offset); From patchwork Mon Jul 9 13:40:51 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: 941289 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRRX1yCRz9s1B for ; Mon, 9 Jul 2018 23:45:28 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E4B96DD6; Mon, 9 Jul 2018 13:41:17 +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 31E25DB7 for ; Mon, 9 Jul 2018 13:41:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A54DDE2 for ; Mon, 9 Jul 2018 13:41:13 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id E6A981BF209; Mon, 9 Jul 2018 13:41:11 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:51 +0300 Message-Id: <20180709134056.7060-10-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 09/14] datapath-windows: Cleanup Oid.c 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 Assign variable directly instead of reassigning it after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Oid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datapath-windows/ovsext/Oid.c b/datapath-windows/ovsext/Oid.c index 7c7ffe750..ff9a42690 100644 --- a/datapath-windows/ovsext/Oid.c +++ b/datapath-windows/ovsext/Oid.c @@ -310,7 +310,7 @@ OvsProcessMethodOid(POVS_SWITCH_CONTEXT switchObject, NDIS_STATUS status = NDIS_STATUS_SUCCESS; struct _METHOD *methodInfo = &(oidRequest->DATA.METHOD_INFORMATION); struct _SET *nicReqSetInfo = NULL; - PNDIS_OBJECT_HEADER header = NULL; + PNDIS_OBJECT_HEADER header = methodInfo->InformationBuffer; PNDIS_OID_REQUEST nicOidRequest = NULL; UNREFERENCED_PARAMETER(switchObject); @@ -320,7 +320,6 @@ OvsProcessMethodOid(POVS_SWITCH_CONTEXT switchObject, *complete = FALSE; *bytesNeededParam = 0; - header = methodInfo->InformationBuffer; switch(methodInfo->Oid) { /* We deal with only OID_SWITCH_NIC_REQUEST as of now */ From patchwork Mon Jul 9 13:40:52 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: 941290 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRS25gHdz9s21 for ; Mon, 9 Jul 2018 23:45:54 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id BAFB0DDF; Mon, 9 Jul 2018 13:41:18 +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 E03C8DC3 for ; Mon, 9 Jul 2018 13:41:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5D954E2 for ; Mon, 9 Jul 2018 13:41:14 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 86C9E1BF221; Mon, 9 Jul 2018 13:41:12 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:52 +0300 Message-Id: <20180709134056.7060-11-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 10/14] datapath-windows: Cleanup PacketIO.c 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 Assign variables directly instead of reassigning them after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/PacketIO.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datapath-windows/ovsext/PacketIO.c b/datapath-windows/ovsext/PacketIO.c index 38e3e5f36..ecbdd591d 100644 --- a/datapath-windows/ovsext/PacketIO.c +++ b/datapath-windows/ovsext/PacketIO.c @@ -185,12 +185,12 @@ OvsAppendNativeForwardedPacket(POVS_SWITCH_CONTEXT switchContext, ULONG flags, BOOLEAN isRecv) { - POVS_BUFFER_CONTEXT ctx = { 0 }; + POVS_BUFFER_CONTEXT ctx = OvsInitExternalNBLContext(switchContext, + curNbl, isRecv); NDIS_STRING filterReason; *nativeNbls = curNbl; - ctx = OvsInitExternalNBLContext(switchContext, curNbl, isRecv); if (ctx == NULL) { RtlInitUnicodeString(&filterReason, L"Cannot allocate native NBL context."); @@ -238,7 +238,7 @@ OvsStartNBLIngress(POVS_SWITCH_CONTEXT switchContext, OvsFlowKey key = { 0 }; UINT64 hash = 0; PNET_BUFFER curNb = NULL; - POVS_BUFFER_CONTEXT ctx = NULL; + POVS_BUFFER_CONTEXT ctx; nextNbl = curNbl->Next; curNbl->Next = NULL; From patchwork Mon Jul 9 13:40:53 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: 941292 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRSb6nwnz9s29 for ; Mon, 9 Jul 2018 23:46:23 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 83A3DDDD; Mon, 9 Jul 2018 13:41:19 +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 6BA54DC3 for ; Mon, 9 Jul 2018 13:41:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E68FEE2 for ; Mon, 9 Jul 2018 13:41:14 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 3359D1BF20B; Mon, 9 Jul 2018 13:41:13 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:53 +0300 Message-Id: <20180709134056.7060-12-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 11/14] datapath-windows: Cleanup Recirc.c 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 Assign variable directly instead of reassigning it after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Recirc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datapath-windows/ovsext/Recirc.c b/datapath-windows/ovsext/Recirc.c index 2febf060d..d4d170e33 100644 --- a/datapath-windows/ovsext/Recirc.c +++ b/datapath-windows/ovsext/Recirc.c @@ -280,9 +280,8 @@ OvsAddDeferredActions(PNET_BUFFER_LIST nbl, const PNL_ATTR actions) { POVS_DEFERRED_ACTION_QUEUE queue = OvsDeferredActionsQueueGet(); - POVS_DEFERRED_ACTION deferredAction = NULL; + POVS_DEFERRED_ACTION deferredAction = OvsDeferredActionsQueuePush(queue); - deferredAction = OvsDeferredActionsQueuePush(queue); if (deferredAction) { deferredAction->nbl = nbl; deferredAction->actions = actions; From patchwork Mon Jul 9 13:40:54 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: 941294 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRTB0l2Yz9s1B for ; Mon, 9 Jul 2018 23:46:54 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 47667E1B; Mon, 9 Jul 2018 13:41:20 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id AB7FFDBE for ; Mon, 9 Jul 2018 13:41:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp2.linuxfoundation.org (Postfix) with ESMTPS id 1CFC41E50E for ; Mon, 9 Jul 2018 13:41:15 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id D4E231BF203; Mon, 9 Jul 2018 13:41:13 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:54 +0300 Message-Id: <20180709134056.7060-13-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 smtp2.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH 12/14] datapath-windows: Cleanup Tunnel.c 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 Assign variables directly instead of reassigning them after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Tunnel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/datapath-windows/ovsext/Tunnel.c b/datapath-windows/ovsext/Tunnel.c index ad2c254f5..899fce885 100644 --- a/datapath-windows/ovsext/Tunnel.c +++ b/datapath-windows/ovsext/Tunnel.c @@ -65,7 +65,7 @@ OvsTunnelAnalyzePacket(OVS_TUNNEL_PENDED_PACKET *packet) NTSTATUS status = STATUS_SUCCESS; UINT32 packetLength = 0; ULONG bytesCopied = 0; - NET_BUFFER_LIST *copiedNBL = NULL; + NET_BUFFER_LIST *copiedNBL; NET_BUFFER *netBuffer; NDIS_STATUS ndisStatus; @@ -248,12 +248,12 @@ OvsInjectPacketThroughActions(PNET_BUFFER_LIST pNbl, sendCompleteFlags); { - POVS_VPORT_ENTRY vport = NULL; + POVS_VPORT_ENTRY vport; UINT32 portNo = 0; OVS_PACKET_HDR_INFO layers = { 0 }; OvsFlowKey key = { 0 }; UINT64 hash = 0; - PNET_BUFFER curNb = NULL; + PNET_BUFFER curNb = NET_BUFFER_LIST_FIRST_NB(pNbl); OvsFlow *flow = NULL; fwdDetail = NET_BUFFER_LIST_SWITCH_FORWARDING_DETAIL(pNbl); @@ -265,7 +265,6 @@ OvsInjectPacketThroughActions(PNET_BUFFER_LIST pNbl, * We still need to check if the Ethernet header of the innet packet is in a single MD */ - curNb = NET_BUFFER_LIST_FIRST_NB(pNbl); ASSERT(curNb->Next == NULL); NdisAcquireRWLockRead(gOvsSwitchContext->dispatchLock, &lockState, dispatch); From patchwork Mon Jul 9 13:40:55 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: 941295 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRTr2g58z9s1B for ; Mon, 9 Jul 2018 23:47:28 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E3F0CE27; Mon, 9 Jul 2018 13:41:20 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 0631ADC9 for ; Mon, 9 Jul 2018 13:41:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp2.linuxfoundation.org (Postfix) with ESMTPS id A6F6A1E507 for ; Mon, 9 Jul 2018 13:41:16 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 9AFCC1BF222; Mon, 9 Jul 2018 13:41:14 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:55 +0300 Message-Id: <20180709134056.7060-14-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 smtp2.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH 13/14] datapath-windows: Cleanup Vport.c 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 Do not assign an initial value to ` status`, it will be assigned later on. Also, check the result of `status` after `OvsCreateMsgFromVport`. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Vport.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c index 7cf2497e3..f93c72dc2 100644 --- a/datapath-windows/ovsext/Vport.c +++ b/datapath-windows/ovsext/Vport.c @@ -1448,7 +1448,7 @@ OvsRemoveTunnelVport(POVS_USER_PARAMS_CONTEXT usrParamsCtx, NDIS_STATUS OvsAddConfiguredSwitchPorts(POVS_SWITCH_CONTEXT switchContext) { - NDIS_STATUS status = NDIS_STATUS_SUCCESS; + NDIS_STATUS status; ULONG arrIndex; PNDIS_SWITCH_PORT_PARAMETERS portParam; PNDIS_SWITCH_PORT_ARRAY portArray = NULL; @@ -1493,7 +1493,7 @@ cleanup: NDIS_STATUS OvsInitConfiguredSwitchNics(POVS_SWITCH_CONTEXT switchContext) { - NDIS_STATUS status = NDIS_STATUS_SUCCESS; + NDIS_STATUS status; PNDIS_SWITCH_NIC_ARRAY nicArray = NULL; ULONG arrIndex; PNDIS_SWITCH_NIC_PARAMETERS nicParam; @@ -2601,7 +2601,10 @@ OvsDeleteVportCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx, status = OvsCreateMsgFromVport(vport, msgIn, usrParamsCtx->outputBuffer, usrParamsCtx->outputLength, gOvsSwitchContext->dpNo); - + if (status) { + nlError = NlMapStatusToNlErr(status); + goto Cleanup; + } *replyLen = msgOut->nlMsg.nlmsgLen; /* From patchwork Mon Jul 9 13:40:56 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: 941296 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org 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 41PRVP3JFvz9s01 for ; Mon, 9 Jul 2018 23:47:57 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 98301E2A; Mon, 9 Jul 2018 13:41:21 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id F3D30D4B for ; Mon, 9 Jul 2018 13:41:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp2.linuxfoundation.org (Postfix) with ESMTPS id 714311E50E for ; Mon, 9 Jul 2018 13:41:17 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 567101BF21D; Mon, 9 Jul 2018 13:41:15 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 9 Jul 2018 16:40:56 +0300 Message-Id: <20180709134056.7060-15-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180709134056.7060-1-aserdean@ovn.org> References: <20180709134056.7060-1-aserdean@ovn.org> X-Spam-Level: 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 smtp2.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH 14/14] datapath-windows: Cleanup Vxlan.c 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 Assign variables directly instead of reassigning them after. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Vxlan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datapath-windows/ovsext/Vxlan.c b/datapath-windows/ovsext/Vxlan.c index 09809d397..2ec0e0df7 100644 --- a/datapath-windows/ovsext/Vxlan.c +++ b/datapath-windows/ovsext/Vxlan.c @@ -66,10 +66,10 @@ OvsIsTunnelFilterCreated(POVS_SWITCH_CONTEXT switchContext, head = &(switchContext->portNoHashArray[hash & OVS_VPORT_MASK]); LIST_FORALL_SAFE(head, link, next) { - POVS_VPORT_ENTRY vport = NULL; - POVS_VXLAN_VPORT vxlanPort = NULL; - vport = CONTAINING_RECORD(link, OVS_VPORT_ENTRY, portNoLink); - vxlanPort = (POVS_VXLAN_VPORT)vport->priv; + POVS_VPORT_ENTRY vport = + CONTAINING_RECORD(link, OVS_VPORT_ENTRY, portNoLink); + + POVS_VXLAN_VPORT vxlanPort = (POVS_VXLAN_VPORT)vport->priv; if (vxlanPort) { if ((udpPortDest == vxlanPort->dstPort)) { /* The VXLAN tunnel was already created. */