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");