Re: [edk2] [PATCH] NetworkPkg: Remove the redundant code and definition.

2018-08-14 Thread Wu, Jiaxin
Looks good to me. 

Reviewed-by: Jiaxin Wu 


> -Original Message-
> From: Li, Songpeng
> Sent: Monday, August 13, 2018 10:45 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin ; Fu, Siyuan 
> Subject: [PATCH] NetworkPkg: Remove the redundant code and definition.
> 
> Cc: Jiaxin Wu 
> Cc: Siyuan Fu 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li 
> ---
>  NetworkPkg/IScsiDxe/IScsiDxe.inf |  1 -
>  NetworkPkg/IScsiDxe/IScsiProto.c | 33 
>  NetworkPkg/IpSecDxe/Ikev2/Payload.c  | 18 ---
>  NetworkPkg/IpSecDxe/Ikev2/Utility.c  | 76 
>  NetworkPkg/IpSecDxe/Ikev2/Utility.h  | 67 
>  NetworkPkg/TcpDxe/TcpOption.c| 30 ---
>  NetworkPkg/TcpDxe/TcpOption.h| 16 --
>  NetworkPkg/TlsDxe/TlsDxe.inf |  1 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 23 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h | 10 
>  10 files changed, 275 deletions(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf
> b/NetworkPkg/IScsiDxe/IScsiDxe.inf
> index 2d96611b44..60737c96ab 100644
> --- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
> +++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
> @@ -124,7 +124,6 @@
>gEfiIfrTianoGuid  ## SOMETIMES_PRODUCES ## 
> UNDEFINED
>gEfiAcpiTableGuid ## SOMETIMES_CONSUMES ##
> SystemTable
>gEfiAcpi10TableGuid   ## SOMETIMES_CONSUMES ##
> SystemTable
> -  gEfiAcpi20TableGuid   ## SOMETIMES_CONSUMES ##
> SystemTable
>gEfiAdapterInfoNetworkBootGuid## SOMETIMES_CONSUMES ##
> UNDEFINED
>gEfiAdapterInfoUndiIpv6SupportGuid## SOMETIMES_CONSUMES ##
> GUID
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c
> b/NetworkPkg/IScsiDxe/IScsiProto.c
> index 7619360568..f4a49c677a 100644
> --- a/NetworkPkg/IScsiDxe/IScsiProto.c
> +++ b/NetworkPkg/IScsiDxe/IScsiProto.c
> @@ -2096,39 +2096,6 @@ IScsiDelTcb (
>  }
> 
> 
> -/**
> -  Find the task control block by the initator task tag.
> -
> -  @param[in]  TcbList The tcb list.
> -  @param[in]  InitiatorTaskTag The initiator task tag.
> -
> -  @return The task control block found.
> -  @retval NULL The task control block cannot be found.
> -
> -**/
> -ISCSI_TCB *
> -IScsiFindTcbByITT (
> -  IN LIST_ENTRY  *TcbList,
> -  IN UINT32  InitiatorTaskTag
> -  )
> -{
> -  ISCSI_TCB   *Tcb;
> -  LIST_ENTRY  *Entry;
> -
> -  Tcb = NULL;
> -
> -  NET_LIST_FOR_EACH (Entry, TcbList) {
> -Tcb = NET_LIST_USER_STRUCT (Entry, ISCSI_TCB, Link);
> -
> -if (Tcb->InitiatorTaskTag == InitiatorTaskTag) {
> -  break;
> -}
> -  }
> -
> -  return Tcb;
> -}
> -
> -
>  /**
>Create a data segment, pad it, and calculate the CRC if needed.
> 
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> index 218c26f934..1bb5e2e5e5 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> @@ -3104,24 +3104,6 @@ ON_EXIT:
>return Status;
>  }
> 
> -/**
> -  Save some useful payloads after accepting the Packet.
> -
> -  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON
> related to the operation.
> -  @param[in] IkePacket   Pointer to received IkePacet.
> -  @param[in] IkeType The type used to indicate it is in IkeSa or 
> ChildSa or
> Info
> - exchange.
> -
> -**/
> -VOID
> -Ikev2OnPacketAccepted (
> -  IN IKEV2_SESSION_COMMON *SessionCommon,
> -  IN IKE_PACKET   *IkePacket,
> -  IN UINT8IkeType
> -  )
> -{
> -  return;
> -}
> 
>  /**
> 
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> index 698aba1327..0c9c929705 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> @@ -290,21 +290,6 @@ Ikev2SaSessionRemove (
>return NULL;
>  }
> 
> -/**
> -  Marking a SA session as on deleting.
> -
> -  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.
> -
> -  @retval EFI_SUCCESS   Find the related SA session and marked it.
> -
> -**/
> -EFI_STATUS
> -Ikev2SaSessionOnDeleting (
> -  IN IKEV2_SA_SESSION  *IkeSaSession
> -  )
> -{
> -  return EFI_SUCCESS;
> -}
> 
>  /**
>Free specified Seession Common. The session common would belong to a
> IKE SA or
> @@ -659,33 +644,6 @@ Ikev2ChildSaSessionReg (
>return ;
>  }
> 
> -/**
> -  Find the ChildSaSession by it's MessagId.
> -
> -  @param[in] SaSessionList  Pointer to a ChildSaSession List.
> -  @param[in] MidThe messageId used to search ChildSaSession.
> -
> -  @return Pointer to IKEV2_CHILD_SA_SESSION or NULL.
> -
> -**/
> -IKEV2_CHILD_SA_SESSION *
> -Ikev2ChildSaSessionLookupByMid (
> -  IN LIST_ENTRY   *SaSessionList,
> -  IN UINT32   Mid
> -  )
> -{
> -  LIST_ENTRY  *Entry;
> -  

Re: [edk2] [PATCH] NetworkPkg: Remove the redundant code and definition.

2018-08-14 Thread Laszlo Ersek
On 08/13/18 04:45, Songpeng Li wrote:
> Cc: Jiaxin Wu 
> Cc: Siyuan Fu 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li 
> ---
>  NetworkPkg/IScsiDxe/IScsiDxe.inf |  1 -
>  NetworkPkg/IScsiDxe/IScsiProto.c | 33 
>  NetworkPkg/IpSecDxe/Ikev2/Payload.c  | 18 ---
>  NetworkPkg/IpSecDxe/Ikev2/Utility.c  | 76 
>  NetworkPkg/IpSecDxe/Ikev2/Utility.h  | 67 
>  NetworkPkg/TcpDxe/TcpOption.c| 30 ---
>  NetworkPkg/TcpDxe/TcpOption.h| 16 --
>  NetworkPkg/TlsDxe/TlsDxe.inf |  1 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 23 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h | 10 
>  10 files changed, 275 deletions(-)

Nacked-by: Laszlo Ersek 


Please fragment the patch to a series so that each patch modify only one
module under NetworkPkg. References:

4A89E2EF3DFEDB4C8BFDE51014F606A14E2C6745@SHSMSX104.ccr.corp.intel.com">http://mid.mail-archive.com/4A89E2EF3DFEDB4C8BFDE51014F606A14E2C6745@SHSMSX104.ccr.corp.intel.com

20180808084712.34696-1-shenglei.zhang@intel.com">http://mid.mail-archive.com/20180808084712.34696-1-shenglei.zhang@intel.com

Laszlo
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel


Re: [edk2] [PATCH] NetworkPkg: Remove the redundant code and definition.

2018-08-12 Thread Fu, Siyuan
Reviewed-by: Fu Siyuan 



> -Original Message-
> From: Li, Songpeng
> Sent: Thursday, August 9, 2018 4:33 PM
> To: edk2-devel@lists.01.org; Fu, Siyuan ; Wu, Jiaxin
> 
> Cc: Li, Songpeng 
> Subject: [PATCH] NetworkPkg: Remove the redundant code and definition.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li 
> ---
>  NetworkPkg/IScsiDxe/IScsiDxe.inf |  1 -
>  NetworkPkg/IScsiDxe/IScsiProto.c | 33 
>  NetworkPkg/IpSecDxe/Ikev2/Payload.c  | 18 ---
>  NetworkPkg/IpSecDxe/Ikev2/Utility.c  | 76 
>  NetworkPkg/IpSecDxe/Ikev2/Utility.h  | 67 
>  NetworkPkg/TcpDxe/TcpOption.c| 30 ---
>  NetworkPkg/TcpDxe/TcpOption.h| 16 --
>  NetworkPkg/TlsDxe/TlsDxe.inf |  1 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 23 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h | 10 
>  10 files changed, 275 deletions(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf
> b/NetworkPkg/IScsiDxe/IScsiDxe.inf
> index 2d96611b44..60737c96ab 100644
> --- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
> +++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
> @@ -124,7 +124,6 @@
>gEfiIfrTianoGuid  ## SOMETIMES_PRODUCES ##
> UNDEFINED
>gEfiAcpiTableGuid ## SOMETIMES_CONSUMES ##
> SystemTable
>gEfiAcpi10TableGuid   ## SOMETIMES_CONSUMES ##
> SystemTable
> -  gEfiAcpi20TableGuid   ## SOMETIMES_CONSUMES ##
> SystemTable
>gEfiAdapterInfoNetworkBootGuid## SOMETIMES_CONSUMES ##
> UNDEFINED
>gEfiAdapterInfoUndiIpv6SupportGuid## SOMETIMES_CONSUMES ##
> GUID
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c
> b/NetworkPkg/IScsiDxe/IScsiProto.c
> index 7619360568..f4a49c677a 100644
> --- a/NetworkPkg/IScsiDxe/IScsiProto.c
> +++ b/NetworkPkg/IScsiDxe/IScsiProto.c
> @@ -2096,39 +2096,6 @@ IScsiDelTcb (
>  }
> 
> 
> -/**
> -  Find the task control block by the initator task tag.
> -
> -  @param[in]  TcbList The tcb list.
> -  @param[in]  InitiatorTaskTag The initiator task tag.
> -
> -  @return The task control block found.
> -  @retval NULL The task control block cannot be found.
> -
> -**/
> -ISCSI_TCB *
> -IScsiFindTcbByITT (
> -  IN LIST_ENTRY  *TcbList,
> -  IN UINT32  InitiatorTaskTag
> -  )
> -{
> -  ISCSI_TCB   *Tcb;
> -  LIST_ENTRY  *Entry;
> -
> -  Tcb = NULL;
> -
> -  NET_LIST_FOR_EACH (Entry, TcbList) {
> -Tcb = NET_LIST_USER_STRUCT (Entry, ISCSI_TCB, Link);
> -
> -if (Tcb->InitiatorTaskTag == InitiatorTaskTag) {
> -  break;
> -}
> -  }
> -
> -  return Tcb;
> -}
> -
> -
>  /**
>Create a data segment, pad it, and calculate the CRC if needed.
> 
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> index 218c26f934..1bb5e2e5e5 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> @@ -3104,24 +3104,6 @@ ON_EXIT:
>return Status;
>  }
> 
> -/**
> -  Save some useful payloads after accepting the Packet.
> -
> -  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON related to
> the operation.
> -  @param[in] IkePacket   Pointer to received IkePacet.
> -  @param[in] IkeType The type used to indicate it is in IkeSa or
> ChildSa or Info
> - exchange.
> -
> -**/
> -VOID
> -Ikev2OnPacketAccepted (
> -  IN IKEV2_SESSION_COMMON *SessionCommon,
> -  IN IKE_PACKET   *IkePacket,
> -  IN UINT8IkeType
> -  )
> -{
> -  return;
> -}
> 
>  /**
> 
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> index 698aba1327..0c9c929705 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> @@ -290,21 +290,6 @@ Ikev2SaSessionRemove (
>return NULL;
>  }
> 
> -/**
> -  Marking a SA session as on deleting.
> -
> -  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.
> -
> -  @retval EFI_SUCCESS   Find the related SA session and marked it.
> -
> -**/
> -EFI_STATUS
> -Ikev2SaSessionOnDeleting (
> -  IN IKEV2_SA_SESSION  *IkeSaSession
> -  )
> -{
> -  return EFI_SUCCESS;
> -}
> 
>  /**
>Free specified Seession Common. The session common would belong to a
> IKE SA or
> @@ -659,33 +644,6 @@ Ikev2ChildSaSessionReg (
>return ;
>  }
> 
> -/**
> -  Find the ChildSaSession by it's MessagId.
> -
> -  @param[in] SaSessionList  Pointer to a ChildSaSession List.
> -  @param[in] MidThe messageId used to search ChildSaSession.
> -
> -  @return Pointer to IKEV2_CHILD_SA_SESSION or NULL.
> -
> -**/
> -IKEV2_CHILD_SA_SESSION *
> -Ikev2ChildSaSessionLookupByMid (
> -  IN LIST_ENTRY   *SaSessionList,
> -  IN UINT32   Mid
> -  )
> -{
> -  LIST_ENTRY  *Entry;
> -  IKEV2_CHILD_SA_SESSION  *ChildSaSession;
> -
> -  NET_LIST_FOR_EACH (Entry, SaSessionList) {
> -

Re: [edk2] [PATCH] NetworkPkg: Remove the redundant code and definition.

2018-08-12 Thread Fu, Siyuan
Hi, Songpeng

The patch is good with me, please remember to update the copyright year when 
commit it.

Reviewed-by: Fu Siyuan 

> -Original Message-
> From: Li, Songpeng
> Sent: Monday, August 13, 2018 10:45 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin ; Fu, Siyuan 
> Subject: [PATCH] NetworkPkg: Remove the redundant code and definition.
> 
> Cc: Jiaxin Wu 
> Cc: Siyuan Fu 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li 
> ---
>  NetworkPkg/IScsiDxe/IScsiDxe.inf |  1 -
>  NetworkPkg/IScsiDxe/IScsiProto.c | 33 
>  NetworkPkg/IpSecDxe/Ikev2/Payload.c  | 18 ---
>  NetworkPkg/IpSecDxe/Ikev2/Utility.c  | 76 
>  NetworkPkg/IpSecDxe/Ikev2/Utility.h  | 67 
>  NetworkPkg/TcpDxe/TcpOption.c| 30 ---
>  NetworkPkg/TcpDxe/TcpOption.h| 16 --
>  NetworkPkg/TlsDxe/TlsDxe.inf |  1 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 23 -
>  NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h | 10 
>  10 files changed, 275 deletions(-)
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf
> b/NetworkPkg/IScsiDxe/IScsiDxe.inf
> index 2d96611b44..60737c96ab 100644
> --- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
> +++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
> @@ -124,7 +124,6 @@
>gEfiIfrTianoGuid  ## SOMETIMES_PRODUCES ##
> UNDEFINED
>gEfiAcpiTableGuid ## SOMETIMES_CONSUMES ##
> SystemTable
>gEfiAcpi10TableGuid   ## SOMETIMES_CONSUMES ##
> SystemTable
> -  gEfiAcpi20TableGuid   ## SOMETIMES_CONSUMES ##
> SystemTable
>gEfiAdapterInfoNetworkBootGuid## SOMETIMES_CONSUMES ##
> UNDEFINED
>gEfiAdapterInfoUndiIpv6SupportGuid## SOMETIMES_CONSUMES ##
> GUID
> 
> diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c
> b/NetworkPkg/IScsiDxe/IScsiProto.c
> index 7619360568..f4a49c677a 100644
> --- a/NetworkPkg/IScsiDxe/IScsiProto.c
> +++ b/NetworkPkg/IScsiDxe/IScsiProto.c
> @@ -2096,39 +2096,6 @@ IScsiDelTcb (
>  }
> 
> 
> -/**
> -  Find the task control block by the initator task tag.
> -
> -  @param[in]  TcbList The tcb list.
> -  @param[in]  InitiatorTaskTag The initiator task tag.
> -
> -  @return The task control block found.
> -  @retval NULL The task control block cannot be found.
> -
> -**/
> -ISCSI_TCB *
> -IScsiFindTcbByITT (
> -  IN LIST_ENTRY  *TcbList,
> -  IN UINT32  InitiatorTaskTag
> -  )
> -{
> -  ISCSI_TCB   *Tcb;
> -  LIST_ENTRY  *Entry;
> -
> -  Tcb = NULL;
> -
> -  NET_LIST_FOR_EACH (Entry, TcbList) {
> -Tcb = NET_LIST_USER_STRUCT (Entry, ISCSI_TCB, Link);
> -
> -if (Tcb->InitiatorTaskTag == InitiatorTaskTag) {
> -  break;
> -}
> -  }
> -
> -  return Tcb;
> -}
> -
> -
>  /**
>Create a data segment, pad it, and calculate the CRC if needed.
> 
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> index 218c26f934..1bb5e2e5e5 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
> @@ -3104,24 +3104,6 @@ ON_EXIT:
>return Status;
>  }
> 
> -/**
> -  Save some useful payloads after accepting the Packet.
> -
> -  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON related to
> the operation.
> -  @param[in] IkePacket   Pointer to received IkePacet.
> -  @param[in] IkeType The type used to indicate it is in IkeSa or
> ChildSa or Info
> - exchange.
> -
> -**/
> -VOID
> -Ikev2OnPacketAccepted (
> -  IN IKEV2_SESSION_COMMON *SessionCommon,
> -  IN IKE_PACKET   *IkePacket,
> -  IN UINT8IkeType
> -  )
> -{
> -  return;
> -}
> 
>  /**
> 
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> index 698aba1327..0c9c929705 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
> @@ -290,21 +290,6 @@ Ikev2SaSessionRemove (
>return NULL;
>  }
> 
> -/**
> -  Marking a SA session as on deleting.
> -
> -  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.
> -
> -  @retval EFI_SUCCESS   Find the related SA session and marked it.
> -
> -**/
> -EFI_STATUS
> -Ikev2SaSessionOnDeleting (
> -  IN IKEV2_SA_SESSION  *IkeSaSession
> -  )
> -{
> -  return EFI_SUCCESS;
> -}
> 
>  /**
>Free specified Seession Common. The session common would belong to a
> IKE SA or
> @@ -659,33 +644,6 @@ Ikev2ChildSaSessionReg (
>return ;
>  }
> 
> -/**
> -  Find the ChildSaSession by it's MessagId.
> -
> -  @param[in] SaSessionList  Pointer to a ChildSaSession List.
> -  @param[in] MidThe messageId used to search ChildSaSession.
> -
> -  @return Pointer to IKEV2_CHILD_SA_SESSION or NULL.
> -
> -**/
> -IKEV2_CHILD_SA_SESSION *
> -Ikev2ChildSaSessionLookupByMid (
> -  IN LIST_ENTRY   *SaSessionList,
> -  IN 

[edk2] [PATCH] NetworkPkg: Remove the redundant code and definition.

2018-08-12 Thread Songpeng Li
Cc: Jiaxin Wu 
Cc: Siyuan Fu 
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Songpeng Li 
---
 NetworkPkg/IScsiDxe/IScsiDxe.inf |  1 -
 NetworkPkg/IScsiDxe/IScsiProto.c | 33 
 NetworkPkg/IpSecDxe/Ikev2/Payload.c  | 18 ---
 NetworkPkg/IpSecDxe/Ikev2/Utility.c  | 76 
 NetworkPkg/IpSecDxe/Ikev2/Utility.h  | 67 
 NetworkPkg/TcpDxe/TcpOption.c| 30 ---
 NetworkPkg/TcpDxe/TcpOption.h| 16 --
 NetworkPkg/TlsDxe/TlsDxe.inf |  1 -
 NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 23 -
 NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h | 10 
 10 files changed, 275 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf
index 2d96611b44..60737c96ab 100644
--- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
+++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
@@ -124,7 +124,6 @@
   gEfiIfrTianoGuid  ## SOMETIMES_PRODUCES ## 
UNDEFINED
   gEfiAcpiTableGuid ## SOMETIMES_CONSUMES ## 
SystemTable
   gEfiAcpi10TableGuid   ## SOMETIMES_CONSUMES ## 
SystemTable
-  gEfiAcpi20TableGuid   ## SOMETIMES_CONSUMES ## 
SystemTable
   gEfiAdapterInfoNetworkBootGuid## SOMETIMES_CONSUMES ## 
UNDEFINED
   gEfiAdapterInfoUndiIpv6SupportGuid## SOMETIMES_CONSUMES ## GUID
 
diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c b/NetworkPkg/IScsiDxe/IScsiProto.c
index 7619360568..f4a49c677a 100644
--- a/NetworkPkg/IScsiDxe/IScsiProto.c
+++ b/NetworkPkg/IScsiDxe/IScsiProto.c
@@ -2096,39 +2096,6 @@ IScsiDelTcb (
 }
 
 
-/**
-  Find the task control block by the initator task tag.
-
-  @param[in]  TcbList The tcb list.
-  @param[in]  InitiatorTaskTag The initiator task tag.
-
-  @return The task control block found.
-  @retval NULL The task control block cannot be found.
-
-**/
-ISCSI_TCB *
-IScsiFindTcbByITT (
-  IN LIST_ENTRY  *TcbList,
-  IN UINT32  InitiatorTaskTag
-  )
-{
-  ISCSI_TCB   *Tcb;
-  LIST_ENTRY  *Entry;
-
-  Tcb = NULL;
-
-  NET_LIST_FOR_EACH (Entry, TcbList) {
-Tcb = NET_LIST_USER_STRUCT (Entry, ISCSI_TCB, Link);
-
-if (Tcb->InitiatorTaskTag == InitiatorTaskTag) {
-  break;
-}
-  }
-
-  return Tcb;
-}
-
-
 /**
   Create a data segment, pad it, and calculate the CRC if needed.
 
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c 
b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
index 218c26f934..1bb5e2e5e5 100644
--- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
@@ -3104,24 +3104,6 @@ ON_EXIT:
   return Status;
 }
 
-/**
-  Save some useful payloads after accepting the Packet.
-
-  @param[in] SessionCommon   Pointer to IKEV2_SESSION_COMMON related to the 
operation.
-  @param[in] IkePacket   Pointer to received IkePacet.
-  @param[in] IkeType The type used to indicate it is in IkeSa or 
ChildSa or Info
- exchange.
-
-**/
-VOID
-Ikev2OnPacketAccepted (
-  IN IKEV2_SESSION_COMMON *SessionCommon,
-  IN IKE_PACKET   *IkePacket,
-  IN UINT8IkeType
-  )
-{
-  return;
-}
 
 /**
 
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c 
b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
index 698aba1327..0c9c929705 100644
--- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
@@ -290,21 +290,6 @@ Ikev2SaSessionRemove (
   return NULL;
 }
 
-/**
-  Marking a SA session as on deleting.
-
-  @param[in]  IkeSaSession  Pointer to IKEV2_SA_SESSION.
-
-  @retval EFI_SUCCESS   Find the related SA session and marked it.
-
-**/
-EFI_STATUS
-Ikev2SaSessionOnDeleting (
-  IN IKEV2_SA_SESSION  *IkeSaSession
-  )
-{
-  return EFI_SUCCESS;
-}
 
 /**
   Free specified Seession Common. The session common would belong to a IKE SA 
or
@@ -659,33 +644,6 @@ Ikev2ChildSaSessionReg (
   return ;
 }
 
-/**
-  Find the ChildSaSession by it's MessagId.
-
-  @param[in] SaSessionList  Pointer to a ChildSaSession List.
-  @param[in] MidThe messageId used to search ChildSaSession.
-
-  @return Pointer to IKEV2_CHILD_SA_SESSION or NULL.
-
-**/
-IKEV2_CHILD_SA_SESSION *
-Ikev2ChildSaSessionLookupByMid (
-  IN LIST_ENTRY   *SaSessionList,
-  IN UINT32   Mid
-  )
-{
-  LIST_ENTRY  *Entry;
-  IKEV2_CHILD_SA_SESSION  *ChildSaSession;
-
-  NET_LIST_FOR_EACH (Entry, SaSessionList) {
-ChildSaSession  = IKEV2_CHILD_SA_SESSION_BY_IKE_SA (Entry);
-
-if (ChildSaSession->MessageId == Mid) {
-  return ChildSaSession;
-}
-  }
-  return NULL;
-}
 
 /**
   This function find the Child SA by the specified SPI.
@@ -776,22 +734,6 @@ Ikev2ChildSaSessionRemove (
   return NULL;
 }
 
-/**
-  Mark a specified Child SA Session as on deleting.
-
-  @param[in]  ChildSaSession   Pointer to IKEV2_CHILD_SA_SESSION.
-
-  @retval EFI_SUCCESS  Operation is successful.
-