From patchwork Thu Jun 16 17:17:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Raju X-Patchwork-Id: 636580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rVqnQ5Fphz9t0T for ; Fri, 17 Jun 2016 03:17:14 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 0253510A13; Thu, 16 Jun 2016 10:17:14 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 4DA80109D4 for ; Thu, 16 Jun 2016 10:17:12 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 78F0E162701 for ; Thu, 16 Jun 2016 11:17:11 -0600 (MDT) X-ASG-Debug-ID: 1466097430-0b3237731f0da00001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar6.cudamail.com with ESMTP id GTxC6rBQCEkWYUnX (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 16 Jun 2016 11:17:10 -0600 (MDT) X-Barracuda-Envelope-From: nithin@vmware.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO smtp-outbound-1.vmware.com) (208.91.2.12) by mx3-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 16 Jun 2016 17:17:10 -0000 Received-SPF: unknown (mx3-pf2.cudamail.com: domain at _spf.vmwa does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 208.91.2.12 X-Barracuda-RBL-IP: 208.91.2.12 Received: from sc9-mailhost2.vmware.com (sc9-mailhost2.vmware.com [10.113.161.72]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id EBA08981B8 for ; Thu, 16 Jun 2016 10:17:08 -0700 (PDT) Received: from pa-dbc1118.eng.vmware.com (unknown [10.162.210.18]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 91ACEB0483; Thu, 16 Jun 2016 10:17:09 -0700 (PDT) X-CudaMail-Envelope-Sender: nithin@vmware.com From: Nithin Raju To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-615035373 X-CudaMail-DTE: 061616 X-CudaMail-Originating-IP: 208.91.2.12 Date: Thu, 16 Jun 2016 10:17:09 -0700 X-ASG-Orig-Subj: [##CM-V2-615035373##][PATCH] datapath-windows: comment cleanup and indentation Message-Id: <1466097429-35903-1-git-send-email-nithin@vmware.com> X-Mailer: git-send-email 2.6.2 X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1466097430 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Subject: [ovs-dev] [PATCH] datapath-windows: comment cleanup and indentation X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Nithin Raju Acked-by: Sairam Venugopal Acked-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Flow.c | 20 ++++++++++---------- datapath-windows/ovsext/Vxlan.c | 5 ----- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c index 2a91855..595518f 100644 --- a/datapath-windows/ovsext/Flow.c +++ b/datapath-windows/ovsext/Flow.c @@ -1650,19 +1650,19 @@ MapTunAttrToFlowPut(PNL_ATTR *keyAttrs, if (keyAttrs[OVS_KEY_ATTR_TUNNEL]) { if (tunAttrs[OVS_TUNNEL_KEY_ATTR_ID]) { - destKey->tunKey.tunnelId = NlAttrGetU64 - (tunAttrs[OVS_TUNNEL_KEY_ATTR_ID]); + destKey->tunKey.tunnelId = + NlAttrGetU64(tunAttrs[OVS_TUNNEL_KEY_ATTR_ID]); destKey->tunKey.flags |= OVS_TNL_F_KEY; } if (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_DST]) { - destKey->tunKey.dst = NlAttrGetU32 - (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_DST]); + destKey->tunKey.dst = + NlAttrGetU32(tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_DST]); } if (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_SRC]) { - destKey->tunKey.src = NlAttrGetU32 - (tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_SRC]); + destKey->tunKey.src = + NlAttrGetU32(tunAttrs[OVS_TUNNEL_KEY_ATTR_IPV4_SRC]); } if (tunAttrs[OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT]) { @@ -1674,13 +1674,13 @@ MapTunAttrToFlowPut(PNL_ATTR *keyAttrs, } if (tunAttrs[OVS_TUNNEL_KEY_ATTR_TOS]) { - destKey->tunKey.tos = NlAttrGetU8 - (tunAttrs[OVS_TUNNEL_KEY_ATTR_TOS]); + destKey->tunKey.tos = + NlAttrGetU8(tunAttrs[OVS_TUNNEL_KEY_ATTR_TOS]); } if (tunAttrs[OVS_TUNNEL_KEY_ATTR_TTL]) { - destKey->tunKey.ttl = NlAttrGetU8 - (tunAttrs[OVS_TUNNEL_KEY_ATTR_TTL]); + destKey->tunKey.ttl = + NlAttrGetU8(tunAttrs[OVS_TUNNEL_KEY_ATTR_TTL]); } destKey->tunKey.pad = 0; diff --git a/datapath-windows/ovsext/Vxlan.c b/datapath-windows/ovsext/Vxlan.c index f6a55f0..ddd8d8e 100644 --- a/datapath-windows/ovsext/Vxlan.c +++ b/datapath-windows/ovsext/Vxlan.c @@ -194,11 +194,6 @@ OvsDoEncapVxlan(POVS_VPORT_ENTRY vport, ULONG mss = 0; NDIS_TCP_IP_CHECKSUM_NET_BUFFER_LIST_INFO csumInfo; - /* - * XXX: the assumption currently is that the NBL is owned by OVS, and - * headroom has already been allocated as part of allocating the NBL and - * MDL. - */ curNb = NET_BUFFER_LIST_FIRST_NB(curNbl); packetLength = NET_BUFFER_DATA_LENGTH(curNb);