[edk2] MdeModulePkg/Network: Fixed build

Message ID 0877601216922E4B83A7129715B5DA2BA7B7583D2C@GEORGE.Emea.Arm.com
State New
Headers show

Commit Message

Olivier Martin May 14, 2014, 5:37 a.m.
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 <olivier.martin@arm.com>

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

Comments

Tian, Feng May 14, 2014, 7:12 a.m. | #1
Thanks, Martin

We will review it and if no problem we will check it in.

Best Regards
Feng

-----Original Message-----
From: Olivier Martin [mailto:Olivier.Martin@arm.com] 
Sent: Wednesday, May 14, 2014 13:38
To: Tian, Feng
Cc: edk2-devel@lists.sourceforge.net
Subject: [PATCH] MdeModulePkg/Network: Fixed build

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 <olivier.martin@arm.com>

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

Patch

From a46430663c443278ae586577706d7c5b746360a9 Mon Sep 17 00:00:00 2001
From: Olivier Martin <olivier.martin@arm.com>
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 <olivier.martin@arm.com>
---
 .../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