From patchwork Fri Jul 14 04:40:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 788108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.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 3x80vg2xR1z9s76 for ; Fri, 14 Jul 2017 15:03:43 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C0D39D2F; Fri, 14 Jul 2017 04:42:08 +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 B7B39D14 for ; Fri, 14 Jul 2017 04:42:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.cloudbasesolutions.com (mail.cloudbasesolutions.com [91.232.152.5]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 9BEF7AC for ; Fri, 14 Jul 2017 04:41:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.cloudbasesolutions.com (Postfix) with ESMTP id E758141A8D for ; Fri, 14 Jul 2017 07:41:58 +0300 (EEST) X-Virus-Scanned: amavisd-new at cloudbasesolutions.com Received: from mail.cloudbasesolutions.com ([127.0.0.1]) by localhost (mail.cloudbasesolutions.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bomINhxhxwcM for ; Fri, 14 Jul 2017 07:41:58 +0300 (EEST) Received: from mail.cloudbasesolutions.com (unknown [10.77.78.3]) by mail.cloudbasesolutions.com (Postfix) with ESMTP id 46E4343356 for ; Fri, 14 Jul 2017 07:41:58 +0300 (EEST) Received: from CBSEX1.cloudbase.local ([10.77.78.3]) by CBSEX1.cloudbase.local ([10.77.78.3]) with mapi id 14.03.0361.001; Fri, 14 Jul 2017 06:41:58 +0200 From: Alin Serdean To: "dev@openvswitch.org" Thread-Topic: [PATCH 35/40] datapath-windows: Treat TCP_HDR_LEN static analysis warnings Thread-Index: AQHS/Fti2dOAlvpuKU2xXCCmiqTDSQ== Date: Fri, 14 Jul 2017 04:40:57 +0000 Message-ID: <20170714044033.15196-36-aserdean@cloudbasesolutions.com> References: <20170714044033.15196-1-aserdean@cloudbasesolutions.com> In-Reply-To: <20170714044033.15196-1-aserdean@cloudbasesolutions.com> Accept-Language: en-US, it-IT Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.77.78.1] MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 35/40] datapath-windows: Treat TCP_HDR_LEN static analysis warnings 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: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Using the shift operator in macros makes the static analyzer on WDK 8.1 confused. Switch to multiplication when trying to get the data offset of the TCP header. Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/NetProto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath-windows/ovsext/NetProto.h b/datapath-windows/ovsext/NetProto.h index 92d6611..9a17dee 100644 --- a/datapath-windows/ovsext/NetProto.h +++ b/datapath-windows/ovsext/NetProto.h @@ -68,7 +68,7 @@ typedef UINT64 IP4FragUnitLength; // length UINT for ipv6 header length. typedef UINT64 IP6UnitLength; -#define TCP_HDR_LEN(tcph) IP4_UNITS_TO_BYTES((tcph)->doff) +#define TCP_HDR_LEN(tcph) ((tcph)->doff * 4) #define TCP_DATA_LENGTH(iph, tcph) (ntohs(iph->tot_len) - \ IP4_HDR_LEN(iph) - TCP_HDR_LEN(tcph))