1. Mark the network volatile variables as deprecated in code comments and remove related code to set/get these variable.

2. Remove the GetTime() call when receiving Udp4/6 packets.
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye, Ting <ting.ye@intel.com>
Reviewed-by: Wu, Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15497 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 49 insertions, 13 deletions

diff --git a/MdePkg/Include/Protocol/Ip4.h b/MdePkg/Include/Protocol/Ip4.h
index 48bc7a0a44..79a9bcacb0 100644
--- a/MdePkg/Include/Protocol/Ip4.h
+++ b/MdePkg/Include/Protocol/Ip4.h
@@ -3,14 +3,14 @@
   Protocol interface. It is split into the following three main

   sections:

   - EFI IPv4 Service Binding Protocol

-  - EFI IPv4 Variable

+  - EFI IPv4 Variable (deprecated in UEFI 2.4B)

   - EFI IPv4 Protocol.

   The EFI IPv4 Protocol provides basic network IPv4 packet I/O services,

   which includes support foR a subset of the Internet Control Message 

   Protocol (ICMP) and may include support for the Internet Group Management

   Protocol (IGMP).

   

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials are licensed and made available under 

 the terms and conditions of the BSD License that accompanies this distribution.  

 The full text of the license may be found at

@@ -40,13 +40,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   }

 

 typedef struct _EFI_IP4_PROTOCOL EFI_IP4_PROTOCOL;

-  

+

+///

+/// EFI_IP4_ADDRESS_PAIR is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   EFI_HANDLE              InstanceHandle;

   EFI_IPv4_ADDRESS        Ip4Address;

   EFI_IPv4_ADDRESS        SubnetMask;

 } EFI_IP4_ADDRESS_PAIR; 

 

+///

+/// EFI_IP4_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   EFI_HANDLE              DriverHandle;

   UINT32                  AddressCount;

diff --git a/MdePkg/Include/Protocol/Ip6.h b/MdePkg/Include/Protocol/Ip6.h
index 8c9b990a36..5d0416d101 100644
--- a/MdePkg/Include/Protocol/Ip6.h
+++ b/MdePkg/Include/Protocol/Ip6.h
@@ -3,14 +3,14 @@
   Protocol interface. It is split into the following three main

   sections:

   - EFI IPv6 Service Binding Protocol

-  - EFI IPv6 Variable

+  - EFI IPv6 Variable (deprecated in UEFI 2.4B)

   - EFI IPv6 Protocol

   The EFI IPv6 Protocol provides basic network IPv6 packet I/O services,

   which includes support for Neighbor Discovery Protocol (ND), Multicast

   Listener Discovery Protocol (MLD), and a subset of the Internet Control

   Message Protocol (ICMPv6).

 

-  Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -43,7 +43,8 @@
 typedef struct _EFI_IP6_PROTOCOL EFI_IP6_PROTOCOL;

 

 ///

-/// EFI_IP6_ADDRESS_PAIR

+/// EFI_IP6_ADDRESS_PAIR is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

 ///

 typedef struct{

   ///

@@ -61,7 +62,8 @@ typedef struct{
 } EFI_IP6_ADDRESS_PAIR;

 

 ///

-/// EFI_IP6_VARIABLE_DATA

+/// EFI_IP6_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

 ///

 typedef struct {

   ///

diff --git a/MdePkg/Include/Protocol/Tcp4.h b/MdePkg/Include/Protocol/Tcp4.h
index 55ed10a162..e27581b1d8 100644
--- a/MdePkg/Include/Protocol/Tcp4.h
+++ b/MdePkg/Include/Protocol/Tcp4.h
@@ -4,7 +4,7 @@
   and destroy child of the driver to communicate with other host using TCP protocol.

   The EFI TCPv4 Protocol provides services to send and receive data stream.

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials are licensed and made available under 

 the terms and conditions of the BSD License that accompanies this distribution.  

 The full text of the license may be found at

@@ -35,6 +35,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 typedef struct _EFI_TCP4_PROTOCOL EFI_TCP4_PROTOCOL;

 

+///

+/// EFI_TCP4_SERVICE_POINT is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   EFI_HANDLE              InstanceHandle;

   EFI_IPv4_ADDRESS        LocalAddress;

@@ -43,6 +47,10 @@ typedef struct {
   UINT16                  RemotePort;

 } EFI_TCP4_SERVICE_POINT;

 

+///

+/// EFI_TCP4_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   EFI_HANDLE              DriverHandle;

   UINT32                  ServiceCount;

diff --git a/MdePkg/Include/Protocol/Tcp6.h b/MdePkg/Include/Protocol/Tcp6.h
index 549b2ff64d..4b9b366242 100644
--- a/MdePkg/Include/Protocol/Tcp6.h
+++ b/MdePkg/Include/Protocol/Tcp6.h
@@ -4,7 +4,7 @@
   and destroy child of the driver to communicate with other host using TCP protocol.

   The EFI TCPv6 Protocol provides services to send and receive data stream.

 

-  Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -38,7 +38,8 @@
 typedef struct _EFI_TCP6_PROTOCOL EFI_TCP6_PROTOCOL;

 

 ///

-/// EFI_TCP6_SERVICE_POINT

+/// EFI_TCP6_SERVICE_POINT is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

 ///

 typedef struct {

   ///

@@ -69,7 +70,8 @@ typedef struct {
 } EFI_TCP6_SERVICE_POINT;

 

 ///

-/// EFI_TCP6_VARIABLE_DATA

+/// EFI_TCP6_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

 ///

 typedef struct {

   EFI_HANDLE             DriverHandle; ///< The handle of the driver that creates this entry.

diff --git a/MdePkg/Include/Protocol/Udp4.h b/MdePkg/Include/Protocol/Udp4.h
index bf3a434f33..dfd550757b 100644
--- a/MdePkg/Include/Protocol/Udp4.h
+++ b/MdePkg/Include/Protocol/Udp4.h
@@ -4,7 +4,7 @@
   The EFI UDPv4 Protocol provides simple packet-oriented services 

   to transmit and receive UDP packets.  

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials are licensed and made available under 

 the terms and conditions of the BSD License that accompanies this distribution.  

 The full text of the license may be found at

@@ -37,6 +37,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 typedef struct _EFI_UDP4_PROTOCOL EFI_UDP4_PROTOCOL; 

   

+///

+/// EFI_UDP4_SERVICE_POINT is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   EFI_HANDLE              InstanceHandle;

   EFI_IPv4_ADDRESS        LocalAddress;

@@ -45,6 +49,10 @@ typedef struct {
   UINT16                  RemotePort;

 } EFI_UDP4_SERVICE_POINT; 

 

+///

+/// EFI_UDP4_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   EFI_HANDLE              DriverHandle;

   UINT32                  ServiceCount;

diff --git a/MdePkg/Include/Protocol/Udp6.h b/MdePkg/Include/Protocol/Udp6.h
index 1112050112..13cce8c4af 100644
--- a/MdePkg/Include/Protocol/Udp6.h
+++ b/MdePkg/Include/Protocol/Udp6.h
@@ -3,7 +3,7 @@
   the EFI IPv6 Protocol and provides simple packet-oriented services to transmit and receive

   UDP packets.

 

-  Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

@@ -32,6 +32,10 @@
     0x4f948815, 0xb4b9, 0x43cb, {0x8a, 0x33, 0x90, 0xe0, 0x60, 0xb3, 0x49, 0x55 } \

   }

 

+///

+/// EFI_UDP6_SERVICE_POINT is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   ///

   /// The EFI UDPv6 Protocol instance handle that is using this address/port pair.

@@ -59,6 +63,10 @@ typedef struct {
   UINT16              RemotePort;

 } EFI_UDP6_SERVICE_POINT;

 

+///

+/// EFI_UDP6_VARIABLE_DATA is deprecated in the UEFI 2.4B and should not be used any more.

+/// The definition in here is only present to provide backwards compatability.

+///

 typedef struct {

   ///

   /// The handle of the driver that creates this entry.