From patchwork Fri Mar 25 16:34:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Raju X-Patchwork-Id: 602046 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 3qWpmN00w8z9sBG for ; Sat, 26 Mar 2016 03:34:27 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 5B6431097A; Fri, 25 Mar 2016 09:34:20 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id C9A2510974 for ; Fri, 25 Mar 2016 09:34:19 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 3CF241E03CA for ; Fri, 25 Mar 2016 10:34:19 -0600 (MDT) X-ASG-Debug-ID: 1458923658-09eadd609f3b8c0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id hkt6MOBngEnROfcJ (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 25 Mar 2016 10:34:18 -0600 (MDT) X-Barracuda-Envelope-From: nithin@vmware.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO smtp-outbound-1.vmware.com) (208.91.2.12) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 25 Mar 2016 16:34:18 -0000 Received-SPF: error (mx1-pf2.cudamail.com: error in processing during lookup of vmware.com: DNS problem) 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 F37A229513 for ; Fri, 25 Mar 2016 09:34:16 -0700 (PDT) Received: from pa-dbc1118.eng.vmware.com (unknown [10.162.210.18]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id A1F27B12FF; Fri, 25 Mar 2016 09:34:17 -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-E2-324064829 X-CudaMail-DTE: 032516 X-CudaMail-Originating-IP: 208.91.2.12 Date: Fri, 25 Mar 2016 09:34:17 -0700 X-ASG-Orig-Subj: [##CM-E2-324064829##][PATCH] datapath-windows: fix alignment in Flow.c Message-Id: <1458923657-51506-1-git-send-email-nithin@vmware.com> X-Mailer: git-send-email 2.6.2 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1458923658 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: fix alignment in Flow.c 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" Cosmetic changes. Acked-by: Nithin Raju --- datapath-windows/ovsext/Flow.c | 56 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c index f15a3de..02c41b7 100644 --- a/datapath-windows/ovsext/Flow.c +++ b/datapath-windows/ovsext/Flow.c @@ -1018,8 +1018,8 @@ _MapFlowIpv4KeyToNlKey(PNL_BUFFER nlBuf, IpKey *ipv4FlowPutKey) ipv4Key.ipv4_frag = ipv4FlowPutKey->nwFrag; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_IPV4, - (PCHAR)(&ipv4Key), - sizeof(struct ovs_key_ipv4))) { + (PCHAR)(&ipv4Key), + sizeof(struct ovs_key_ipv4))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1030,8 +1030,8 @@ _MapFlowIpv4KeyToNlKey(PNL_BUFFER nlBuf, IpKey *ipv4FlowPutKey) tcpKey.tcp_src = ipv4FlowPutKey->l4.tpSrc; tcpKey.tcp_dst = ipv4FlowPutKey->l4.tpDst; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_TCP, - (PCHAR)(&tcpKey), - sizeof(tcpKey))) { + (PCHAR)(&tcpKey), + sizeof(tcpKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1043,8 +1043,8 @@ _MapFlowIpv4KeyToNlKey(PNL_BUFFER nlBuf, IpKey *ipv4FlowPutKey) udpKey.udp_src = ipv4FlowPutKey->l4.tpSrc; udpKey.udp_dst = ipv4FlowPutKey->l4.tpDst; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_UDP, - (PCHAR)(&udpKey), - sizeof(udpKey))) { + (PCHAR)(&udpKey), + sizeof(udpKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1056,8 +1056,8 @@ _MapFlowIpv4KeyToNlKey(PNL_BUFFER nlBuf, IpKey *ipv4FlowPutKey) sctpKey.sctp_src = ipv4FlowPutKey->l4.tpSrc; sctpKey.sctp_dst = ipv4FlowPutKey->l4.tpDst; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_SCTP, - (PCHAR)(&sctpKey), - sizeof(sctpKey))) { + (PCHAR)(&sctpKey), + sizeof(sctpKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1112,8 +1112,8 @@ _MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey, ipv6Key.ipv6_frag = ipv6FlowPutKey->nwFrag; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_IPV6, - (PCHAR)(&ipv6Key), - sizeof(ipv6Key))) { + (PCHAR)(&ipv6Key), + sizeof(ipv6Key))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1124,8 +1124,8 @@ _MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey, tcpKey.tcp_src = ipv6FlowPutKey->l4.tpSrc; tcpKey.tcp_dst = ipv6FlowPutKey->l4.tpDst; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_TCP, - (PCHAR)(&tcpKey), - sizeof(tcpKey))) { + (PCHAR)(&tcpKey), + sizeof(tcpKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1137,8 +1137,8 @@ _MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey, udpKey.udp_src = ipv6FlowPutKey->l4.tpSrc; udpKey.udp_dst = ipv6FlowPutKey->l4.tpDst; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_UDP, - (PCHAR)(&udpKey), - sizeof(udpKey))) { + (PCHAR)(&udpKey), + sizeof(udpKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1150,8 +1150,8 @@ _MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey, sctpKey.sctp_src = ipv6FlowPutKey->l4.tpSrc; sctpKey.sctp_dst = ipv6FlowPutKey->l4.tpDst; if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_SCTP, - (PCHAR)(&sctpKey), - sizeof(sctpKey))) { + (PCHAR)(&sctpKey), + sizeof(sctpKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1167,8 +1167,8 @@ _MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey, icmpV6Key.icmpv6_code = (__u8)(icmpv6FlowPutKey->l4.tpDst); if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_ICMPV6, - (PCHAR)(&icmpV6Key), - sizeof(icmpV6Key))) { + (PCHAR)(&icmpV6Key), + sizeof(icmpV6Key))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1180,8 +1180,8 @@ _MapFlowIpv6KeyToNlKey(PNL_BUFFER nlBuf, Ipv6Key *ipv6FlowPutKey, RtlCopyMemory(&(ndKey.nd_tll), &icmpv6FlowPutKey->arpTha, ETH_ADDR_LEN); if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_ND, - (PCHAR)(&ndKey), - sizeof(ndKey))) { + (PCHAR)(&ndKey), + sizeof(ndKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -1229,8 +1229,8 @@ _MapFlowArpKeyToNlKey(PNL_BUFFER nlBuf, ArpKey *arpFlowPutKey) arpKey.arp_op = htons(arpFlowPutKey->nwProto); if (!NlMsgPutTailUnspec(nlBuf, OVS_KEY_ATTR_ARP, - (PCHAR)(&arpKey), - sizeof(arpKey))) { + (PCHAR)(&arpKey), + sizeof(arpKey))) { rc = STATUS_UNSUCCESSFUL; goto done; } @@ -2409,11 +2409,11 @@ HandleFlowPut(OvsFlowPut *put, } if ((put->flags & OVSWIN_FLOW_PUT_CLEAR) == 0) { - newFlow->packetCount = KernelFlow->packetCount; - newFlow->byteCount = KernelFlow->byteCount; - newFlow->tcpFlags = KernelFlow->tcpFlags; - newFlow->used = KernelFlow->used; - } + newFlow->packetCount = KernelFlow->packetCount; + newFlow->byteCount = KernelFlow->byteCount; + newFlow->tcpFlags = KernelFlow->tcpFlags; + newFlow->used = KernelFlow->used; + } RemoveFlow(datapath, &KernelFlow); status = AddFlow(datapath, newFlow); ASSERT(status == STATUS_SUCCESS); @@ -2467,7 +2467,7 @@ OvsPrepareFlow(OvsFlow **flow, localFlow->actionsLen = put->actionsLen; if (put->actionsLen) { NdisMoveMemory((PUCHAR)localFlow->actions, put->actions, - put->actionsLen); + put->actionsLen); } localFlow->userActionsLen = 0; // 0 indicate no conversion is made localFlow->used = 0;