From patchwork Wed May 14 05:37:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Martin X-Patchwork-Id: 30144 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 36F9220369 for ; Wed, 14 May 2014 05:39:53 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id m1sf6689224oag.10 for ; Tue, 13 May 2014 22:39:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:thread-topic :thread-index:message-id:accept-language:acceptlanguage:mime-version :cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-language:content-type; bh=ZEER+wu1VGhzY0tg2xbKE6V81LX2GWvX7gmW0XV6E3Q=; b=ATP/2U7gUGBM9dbEQ6Hu4wibIgqJ0HSO0tKINKl7b+r3RZxwCCzdcQFiyivER1CC1z fjcjrkTxxXaMxcz8drpJVh+6pqKHqWgfWdOkzADvhalRDZIAFoJA11F0UDlgOULrQUNr 3nKyM5L25c60tKKex4Tg24IWQb1ayXgdXYoz4o0Nb+JbRE9+mtMkZG8JOvwcU2crPd31 iKMbiZ9kKFo9wRBe3S5P4pP1wKMTs3/TYKlTvSS0hxjztMwmLir4zs4kuYcn/GiNSbed zsi8KsStmxepJTkOxSubc9Pn0vbNEVyM7JZqhxReTXiWlMK2JcxPRK1bM13iSK91tGqK Jp/Q== X-Gm-Message-State: ALoCoQlK5aMJmCGdim1pJjhc2gXBsEZHBBXOoHm9WG1usm3GYTnWL9u2mK/N+G2gz2FbtBFBHAR0 X-Received: by 10.182.28.136 with SMTP id b8mr681252obh.19.1400045992762; Tue, 13 May 2014 22:39:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.105 with SMTP id s96ls2239966qgd.25.gmail; Tue, 13 May 2014 22:39:52 -0700 (PDT) X-Received: by 10.220.139.198 with SMTP id f6mr65297vcu.47.1400045992680; Tue, 13 May 2014 22:39:52 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id ck5si141731vdd.127.2014.05.13.22.39.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 May 2014 22:39:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id jz11so1750029veb.21 for ; Tue, 13 May 2014 22:39:52 -0700 (PDT) X-Received: by 10.52.11.230 with SMTP id t6mr1038527vdb.27.1400045992443; Tue, 13 May 2014 22:39:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp206346vcb; Tue, 13 May 2014 22:39:51 -0700 (PDT) X-Received: by 10.50.85.37 with SMTP id e5mr2239134igz.43.1400045991672; Tue, 13 May 2014 22:39:51 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id pg1si469114icc.168.2014.05.13.22.39.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 13 May 2014 22:39:51 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1WkRul-0002md-UZ; Wed, 14 May 2014 05:39:39 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1WkRuk-0002mP-1P for edk2-devel@lists.sourceforge.net; Wed, 14 May 2014 05:39:38 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of arm.com designates 195.130.217.12 as permitted sender) client-ip=195.130.217.12; envelope-from=olivier.martin@arm.com; helo=service88.mimecast.com; Received: from service88.mimecast.com ([195.130.217.12]) by sog-mx-4.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1WkRui-0001iv-BX for edk2-devel@lists.sourceforge.net; Wed, 14 May 2014 05:39:37 +0000 Received: from emea-cam-gw1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) (Using TLS) by service88.mimecast.com; Wed, 14 May 2014 06:39:30 +0100 Received: from EMEA-CAM-GW3.Emea.Arm.com (10.1.106.85) by emea-cam-gw1.Emea.Arm.com (10.1.248.203) with Microsoft SMTP Server (TLS) id 8.3.298.1; Wed, 14 May 2014 06:39:36 +0100 Received: from george.Emea.Arm.com ([fe80::4c19:a8f:5c9a:76df]) by EMEA-CAM-GW3.Emea.Arm.com ([::1]) with mapi; Wed, 14 May 2014 06:39:36 +0100 From: Olivier Martin To: "feng.tian@intel.com" Date: Wed, 14 May 2014 06:37:30 +0100 Thread-Topic: [PATCH] MdeModulePkg/Network: Fixed build Thread-Index: AQHPbzbjQmD37buFo0CwUA9f+9Cnig== Message-ID: <0877601216922E4B83A7129715B5DA2BA7B7583D2C@GEORGE.Emea.Arm.com> Accept-Language: en-US, en-GB X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US, en-GB MIME-Version: 1.0 X-MC-Unique: 114051406393002102 X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1WkRui-0001iv-BX Cc: "edk2-devel@lists.sourceforge.net" Subject: [edk2] [PATCH] MdeModulePkg/Network: Fixed build X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: olivier.martin@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Language: en-GB Dear MdeModulePkg maintainer, please find the attached patch that fixes some build issues (ARM toolchain). Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin Regards, Olivier -- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590 ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782 ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs Signed-off-by: Olivier Martin >From a46430663c443278ae586577706d7c5b746360a9 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Fri, 9 May 2014 01:18:53 +0100 Subject: MdeModulePkg/Network: Fixed build - Variable set but not used - Newline missing at the end of Udp4Impl.c Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin --- .../Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c | 2 -- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c | 3 --- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c | 3 ++- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c index e09d2c9..b6d89be 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c @@ -216,12 +216,10 @@ Tcp4FlushPcb ( ) { SOCKET *Sock; - TCP4_PROTO_DATA *TcpProto; IpIoConfigIp (Tcb->IpInfo, NULL); Sock = Tcb->Sk; - TcpProto = (TCP4_PROTO_DATA *) Sock->ProtoReserved; if (SOCK_IS_CONFIGURED (Sock)) { RemoveEntryList (&Tcb->List); diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c index 5b18d20..3702bea 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c @@ -356,7 +356,6 @@ TcpInsertTcb ( LIST_ENTRY *Entry; LIST_ENTRY *Head; TCP_CB *Node; - TCP4_PROTO_DATA *TcpProto; ASSERT ( (Tcb != NULL) && @@ -391,8 +390,6 @@ TcpInsertTcb ( InsertHeadList (Head, &Tcb->List); - TcpProto = (TCP4_PROTO_DATA *) Tcb->Sk->ProtoReserved; - return 0; } diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c index ce952b1..4f077d6 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c @@ -1894,4 +1894,5 @@ Udp4NetVectorExtFree ( VOID *Context ) { -} \ No newline at end of file +} + -- 1.7.5.4