* Re: [PATCH] NetworkPkg: Remove the redundant code and definition.
[not found] <20180809083322.7888-1-songpeng.li@intel.com>
@ 2018-08-13 4:43 ` Fu, Siyuan
0 siblings, 0 replies; 5+ messages in thread
From: Fu, Siyuan @ 2018-08-13 4:43 UTC (permalink / raw)
To: Li, Songpeng, edk2-devel@lists.01.org, Wu, Jiaxin
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
> -----Original Message-----
> From: Li, Songpeng
> Sent: Thursday, August 9, 2018 4:33 PM
> To: edk2-devel@lists.01.org; Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin
> <jiaxin.wu@intel.com>
> Cc: Li, Songpeng <songpeng.li@intel.com>
> Subject: [PATCH] NetworkPkg: Remove the redundant code and definition.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li <songpeng.li@intel.com>
> ---
> 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 UINT8 IkeType
> - )
> -{
> - 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] Mid The 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.
> -
> -**/
> -EFI_STATUS
> -Ikev2ChildSaSessionOnDeleting (
> - IN IKEV2_CHILD_SA_SESSION *ChildSaSession
> - )
> -{
> - return EFI_SUCCESS;
> -}
> -
> /**
> Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
>
> @@ -1137,24 +1079,6 @@ Ikev2ChildSaAssociateSpdEntry (
> }
>
>
> -/**
> - This function finds the SPI from Create Child SA Exchange Packet.
> -
> - @param[in] IkePacket Pointer to IKE_PACKET to be searched.
> -
> - @retval SPI number or 0 if it is not supported.
> -
> -**/
> -UINT32
> -Ikev2ChildExchangeRekeySpi (
> - IN IKE_PACKET *IkePacket
> - )
> -{
> - //
> - // Not support yet.
> - //
> - return 0;
> -}
>
> /**
> Validate the IKE header of received IKE packet.
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> index 8383ff8dd6..79def7740d 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> @@ -104,19 +104,6 @@ Ikev2SaSessionRemove (
> );
>
>
> -/**
> - 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
> - );
> -
> /**
> After IKE/Child SA is estiblished, close the time event and free sent
> packet.
>
> @@ -211,20 +198,6 @@ Ikev2ChildSaSessionLookupBySpi (
> IN UINT32 Spi
> );
>
> -/**
> - Find the ChildSaSession by it's MessagId.
> -
> - @param[in] SaSessionList Pointer to a ChildSaSession List.
> - @param[in] Mid The messageId used to search ChildSaSession.
> -
> - @return Pointer to IKEV2_CHILD_SA_SESSION.
> -
> -**/
> -IKEV2_CHILD_SA_SESSION *
> -Ikev2ChildSaSessionLookupByMid (
> - IN LIST_ENTRY *SaSessionList,
> - IN UINT32 Mid
> - );
>
> /**
> Insert a Child SA Session into the specified ChildSa list..
> @@ -257,18 +230,6 @@ Ikev2ChildSaSessionRemove (
> IN UINT8 ListType
> );
>
> -/**
> - Mark a specified Child SA Session as on deleting.
> -
> - @param[in] ChildSaSession Pointer to IKEV2_CHILD_SA_SESSION.
> -
> - @retval EFI_SUCCESS Operation is successful.
> -
> -**/
> -EFI_STATUS
> -Ikev2ChildSaSessionOnDeleting (
> - IN IKEV2_CHILD_SA_SESSION *ChildSaSession
> - );
>
> /**
> Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
> @@ -328,19 +289,6 @@ Ikev2ChildExchangeRequestType(
> IN IKE_PACKET *IkePacket
> );
>
> -/**
> - This function finds the SPI from Create Child Sa Exchange Packet.
> -
> - @param[in] IkePacket Pointer to IKE_PACKET to be searched.
> -
> - @retval SPI number.
> -
> -**/
> -UINT32
> -Ikev2ChildExchangeRekeySpi(
> - IN IKE_PACKET *IkePacket
> - );
> -
>
> /**
> Associate a SPD selector to the Child SA Session.
> @@ -882,21 +830,6 @@ Ikev2DecodePacket (
> IN UINTN IkeType
> );
>
> -/**
> - 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 UINT8 IkeType
> - );
>
> /**
> Send out IKEV2 packet.
> diff --git a/NetworkPkg/TcpDxe/TcpOption.c b/NetworkPkg/TcpDxe/TcpOption.c
> index bacce1070d..73d781729f 100644
> --- a/NetworkPkg/TcpDxe/TcpOption.c
> +++ b/NetworkPkg/TcpDxe/TcpOption.c
> @@ -342,33 +342,3 @@ TcpParseOption (
>
> return 0;
> }
> -
> -/**
> - Check the segment against PAWS.
> -
> - @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
> - @param[in] TSVal The timestamp value.
> -
> - @retval 1 The segment passed the PAWS check.
> - @retval 0 The segment failed to pass the PAWS check.
> -
> -**/
> -UINT32
> -TcpPawsOK (
> - IN TCP_CB *Tcb,
> - IN UINT32 TSVal
> - )
> -{
> - //
> - // PAWS as defined in RFC1323, buggy...
> - //
> - if (TCP_TIME_LT (TSVal, Tcb->TsRecent) &&
> - TCP_TIME_LT (Tcb->TsRecentAge + TCP_PAWS_24DAY, mTcpTick)
> - ) {
> -
> - return 0;
> -
> - }
> -
> - return 1;
> -}
> diff --git a/NetworkPkg/TcpDxe/TcpOption.h b/NetworkPkg/TcpDxe/TcpOption.h
> index 0ccadb9536..9d8581b669 100644
> --- a/NetworkPkg/TcpDxe/TcpOption.h
> +++ b/NetworkPkg/TcpDxe/TcpOption.h
> @@ -126,20 +126,4 @@ TcpParseOption (
> IN OUT TCP_OPTION *Option
> );
>
> -/**
> - Check the segment against PAWS.
> -
> - @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
> - @param[in] TSVal The timestamp value.
> -
> - @retval 1 The segment passed the PAWS check.
> - @retval 0 The segment failed to pass the PAWS check.
> -
> -**/
> -UINT32
> -TcpPawsOK (
> - IN TCP_CB *Tcb,
> - IN UINT32 TSVal
> - );
> -
> #endif
> diff --git a/NetworkPkg/TlsDxe/TlsDxe.inf b/NetworkPkg/TlsDxe/TlsDxe.inf
> index 907feb735b..bbe8c554a2 100644
> --- a/NetworkPkg/TlsDxe/TlsDxe.inf
> +++ b/NetworkPkg/TlsDxe/TlsDxe.inf
> @@ -52,7 +52,6 @@
> BaseLib
> UefiLib
> DebugLib
> - NetLib
> BaseCryptLib
> TlsLib
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> index c06b0242bb..5bbc1922a6 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> @@ -202,29 +202,6 @@ PxeBcCacheDhcp6Packet (
> return EFI_SUCCESS;
> }
>
> -
> -/**
> - Free all the nodes in the list for boot file.
> -
> - @param[in] Head The pointer to the head of list.
> -
> -**/
> -VOID
> -PxeBcFreeBootFileOption (
> - IN LIST_ENTRY *Head
> - )
> -{
> - LIST_ENTRY *Entry;
> - LIST_ENTRY *NextEntry;
> - PXEBC_DHCP6_OPTION_NODE *Node;
> -
> - NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, Head) {
> - Node = NET_LIST_USER_STRUCT (Entry, PXEBC_DHCP6_OPTION_NODE, Link);
> - RemoveEntryList (Entry);
> - FreePool (Node);
> - }
> -}
> -
> /**
> Retrieve the boot server address using the EFI_DNS6_PROTOCOL.
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> index f3dcd89743..d6e6745f0d 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> @@ -116,16 +116,6 @@ typedef struct {
> } PXEBC_DHCP6_PACKET_CACHE;
>
>
> -/**
> - Free all the nodes in the boot file list.
> -
> - @param[in] Head The pointer to the head of the list.
> -
> -**/
> -VOID
> -PxeBcFreeBootFileOption (
> - IN LIST_ENTRY *Head
> - );
>
>
> /**
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] NetworkPkg: Remove the redundant code and definition.
@ 2018-08-13 2:45 Songpeng Li
2018-08-13 4:42 ` Fu, Siyuan
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Songpeng Li @ 2018-08-13 2:45 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiaxin Wu, Siyuan Fu
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Songpeng Li <songpeng.li@intel.com>
---
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 UINT8 IkeType
- )
-{
- 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] Mid The 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.
-
-**/
-EFI_STATUS
-Ikev2ChildSaSessionOnDeleting (
- IN IKEV2_CHILD_SA_SESSION *ChildSaSession
- )
-{
- return EFI_SUCCESS;
-}
-
/**
Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
@@ -1137,24 +1079,6 @@ Ikev2ChildSaAssociateSpdEntry (
}
-/**
- This function finds the SPI from Create Child SA Exchange Packet.
-
- @param[in] IkePacket Pointer to IKE_PACKET to be searched.
-
- @retval SPI number or 0 if it is not supported.
-
-**/
-UINT32
-Ikev2ChildExchangeRekeySpi (
- IN IKE_PACKET *IkePacket
- )
-{
- //
- // Not support yet.
- //
- return 0;
-}
/**
Validate the IKE header of received IKE packet.
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.h b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
index 8383ff8dd6..79def7740d 100644
--- a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
+++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
@@ -104,19 +104,6 @@ Ikev2SaSessionRemove (
);
-/**
- 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
- );
-
/**
After IKE/Child SA is estiblished, close the time event and free sent packet.
@@ -211,20 +198,6 @@ Ikev2ChildSaSessionLookupBySpi (
IN UINT32 Spi
);
-/**
- Find the ChildSaSession by it's MessagId.
-
- @param[in] SaSessionList Pointer to a ChildSaSession List.
- @param[in] Mid The messageId used to search ChildSaSession.
-
- @return Pointer to IKEV2_CHILD_SA_SESSION.
-
-**/
-IKEV2_CHILD_SA_SESSION *
-Ikev2ChildSaSessionLookupByMid (
- IN LIST_ENTRY *SaSessionList,
- IN UINT32 Mid
- );
/**
Insert a Child SA Session into the specified ChildSa list..
@@ -257,18 +230,6 @@ Ikev2ChildSaSessionRemove (
IN UINT8 ListType
);
-/**
- Mark a specified Child SA Session as on deleting.
-
- @param[in] ChildSaSession Pointer to IKEV2_CHILD_SA_SESSION.
-
- @retval EFI_SUCCESS Operation is successful.
-
-**/
-EFI_STATUS
-Ikev2ChildSaSessionOnDeleting (
- IN IKEV2_CHILD_SA_SESSION *ChildSaSession
- );
/**
Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
@@ -328,19 +289,6 @@ Ikev2ChildExchangeRequestType(
IN IKE_PACKET *IkePacket
);
-/**
- This function finds the SPI from Create Child Sa Exchange Packet.
-
- @param[in] IkePacket Pointer to IKE_PACKET to be searched.
-
- @retval SPI number.
-
-**/
-UINT32
-Ikev2ChildExchangeRekeySpi(
- IN IKE_PACKET *IkePacket
- );
-
/**
Associate a SPD selector to the Child SA Session.
@@ -882,21 +830,6 @@ Ikev2DecodePacket (
IN UINTN IkeType
);
-/**
- 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 UINT8 IkeType
- );
/**
Send out IKEV2 packet.
diff --git a/NetworkPkg/TcpDxe/TcpOption.c b/NetworkPkg/TcpDxe/TcpOption.c
index bacce1070d..73d781729f 100644
--- a/NetworkPkg/TcpDxe/TcpOption.c
+++ b/NetworkPkg/TcpDxe/TcpOption.c
@@ -342,33 +342,3 @@ TcpParseOption (
return 0;
}
-
-/**
- Check the segment against PAWS.
-
- @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
- @param[in] TSVal The timestamp value.
-
- @retval 1 The segment passed the PAWS check.
- @retval 0 The segment failed to pass the PAWS check.
-
-**/
-UINT32
-TcpPawsOK (
- IN TCP_CB *Tcb,
- IN UINT32 TSVal
- )
-{
- //
- // PAWS as defined in RFC1323, buggy...
- //
- if (TCP_TIME_LT (TSVal, Tcb->TsRecent) &&
- TCP_TIME_LT (Tcb->TsRecentAge + TCP_PAWS_24DAY, mTcpTick)
- ) {
-
- return 0;
-
- }
-
- return 1;
-}
diff --git a/NetworkPkg/TcpDxe/TcpOption.h b/NetworkPkg/TcpDxe/TcpOption.h
index 0ccadb9536..9d8581b669 100644
--- a/NetworkPkg/TcpDxe/TcpOption.h
+++ b/NetworkPkg/TcpDxe/TcpOption.h
@@ -126,20 +126,4 @@ TcpParseOption (
IN OUT TCP_OPTION *Option
);
-/**
- Check the segment against PAWS.
-
- @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
- @param[in] TSVal The timestamp value.
-
- @retval 1 The segment passed the PAWS check.
- @retval 0 The segment failed to pass the PAWS check.
-
-**/
-UINT32
-TcpPawsOK (
- IN TCP_CB *Tcb,
- IN UINT32 TSVal
- );
-
#endif
diff --git a/NetworkPkg/TlsDxe/TlsDxe.inf b/NetworkPkg/TlsDxe/TlsDxe.inf
index 907feb735b..bbe8c554a2 100644
--- a/NetworkPkg/TlsDxe/TlsDxe.inf
+++ b/NetworkPkg/TlsDxe/TlsDxe.inf
@@ -52,7 +52,6 @@
BaseLib
UefiLib
DebugLib
- NetLib
BaseCryptLib
TlsLib
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
index c06b0242bb..5bbc1922a6 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
@@ -202,29 +202,6 @@ PxeBcCacheDhcp6Packet (
return EFI_SUCCESS;
}
-
-/**
- Free all the nodes in the list for boot file.
-
- @param[in] Head The pointer to the head of list.
-
-**/
-VOID
-PxeBcFreeBootFileOption (
- IN LIST_ENTRY *Head
- )
-{
- LIST_ENTRY *Entry;
- LIST_ENTRY *NextEntry;
- PXEBC_DHCP6_OPTION_NODE *Node;
-
- NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, Head) {
- Node = NET_LIST_USER_STRUCT (Entry, PXEBC_DHCP6_OPTION_NODE, Link);
- RemoveEntryList (Entry);
- FreePool (Node);
- }
-}
-
/**
Retrieve the boot server address using the EFI_DNS6_PROTOCOL.
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
index f3dcd89743..d6e6745f0d 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
@@ -116,16 +116,6 @@ typedef struct {
} PXEBC_DHCP6_PACKET_CACHE;
-/**
- Free all the nodes in the boot file list.
-
- @param[in] Head The pointer to the head of the list.
-
-**/
-VOID
-PxeBcFreeBootFileOption (
- IN LIST_ENTRY *Head
- );
/**
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] NetworkPkg: Remove the redundant code and definition.
2018-08-13 2:45 Songpeng Li
@ 2018-08-13 4:42 ` Fu, Siyuan
2018-08-14 15:14 ` Laszlo Ersek
2018-08-15 0:45 ` Wu, Jiaxin
2 siblings, 0 replies; 5+ messages in thread
From: Fu, Siyuan @ 2018-08-13 4:42 UTC (permalink / raw)
To: Li, Songpeng, edk2-devel@lists.01.org; +Cc: Wu, Jiaxin
Hi, Songpeng
The patch is good with me, please remember to update the copyright year when commit it.
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
> -----Original Message-----
> From: Li, Songpeng
> Sent: Monday, August 13, 2018 10:45 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>
> Subject: [PATCH] NetworkPkg: Remove the redundant code and definition.
>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li <songpeng.li@intel.com>
> ---
> 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 UINT8 IkeType
> - )
> -{
> - 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] Mid The 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.
> -
> -**/
> -EFI_STATUS
> -Ikev2ChildSaSessionOnDeleting (
> - IN IKEV2_CHILD_SA_SESSION *ChildSaSession
> - )
> -{
> - return EFI_SUCCESS;
> -}
> -
> /**
> Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
>
> @@ -1137,24 +1079,6 @@ Ikev2ChildSaAssociateSpdEntry (
> }
>
>
> -/**
> - This function finds the SPI from Create Child SA Exchange Packet.
> -
> - @param[in] IkePacket Pointer to IKE_PACKET to be searched.
> -
> - @retval SPI number or 0 if it is not supported.
> -
> -**/
> -UINT32
> -Ikev2ChildExchangeRekeySpi (
> - IN IKE_PACKET *IkePacket
> - )
> -{
> - //
> - // Not support yet.
> - //
> - return 0;
> -}
>
> /**
> Validate the IKE header of received IKE packet.
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> index 8383ff8dd6..79def7740d 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> @@ -104,19 +104,6 @@ Ikev2SaSessionRemove (
> );
>
>
> -/**
> - 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
> - );
> -
> /**
> After IKE/Child SA is estiblished, close the time event and free sent
> packet.
>
> @@ -211,20 +198,6 @@ Ikev2ChildSaSessionLookupBySpi (
> IN UINT32 Spi
> );
>
> -/**
> - Find the ChildSaSession by it's MessagId.
> -
> - @param[in] SaSessionList Pointer to a ChildSaSession List.
> - @param[in] Mid The messageId used to search ChildSaSession.
> -
> - @return Pointer to IKEV2_CHILD_SA_SESSION.
> -
> -**/
> -IKEV2_CHILD_SA_SESSION *
> -Ikev2ChildSaSessionLookupByMid (
> - IN LIST_ENTRY *SaSessionList,
> - IN UINT32 Mid
> - );
>
> /**
> Insert a Child SA Session into the specified ChildSa list..
> @@ -257,18 +230,6 @@ Ikev2ChildSaSessionRemove (
> IN UINT8 ListType
> );
>
> -/**
> - Mark a specified Child SA Session as on deleting.
> -
> - @param[in] ChildSaSession Pointer to IKEV2_CHILD_SA_SESSION.
> -
> - @retval EFI_SUCCESS Operation is successful.
> -
> -**/
> -EFI_STATUS
> -Ikev2ChildSaSessionOnDeleting (
> - IN IKEV2_CHILD_SA_SESSION *ChildSaSession
> - );
>
> /**
> Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
> @@ -328,19 +289,6 @@ Ikev2ChildExchangeRequestType(
> IN IKE_PACKET *IkePacket
> );
>
> -/**
> - This function finds the SPI from Create Child Sa Exchange Packet.
> -
> - @param[in] IkePacket Pointer to IKE_PACKET to be searched.
> -
> - @retval SPI number.
> -
> -**/
> -UINT32
> -Ikev2ChildExchangeRekeySpi(
> - IN IKE_PACKET *IkePacket
> - );
> -
>
> /**
> Associate a SPD selector to the Child SA Session.
> @@ -882,21 +830,6 @@ Ikev2DecodePacket (
> IN UINTN IkeType
> );
>
> -/**
> - 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 UINT8 IkeType
> - );
>
> /**
> Send out IKEV2 packet.
> diff --git a/NetworkPkg/TcpDxe/TcpOption.c b/NetworkPkg/TcpDxe/TcpOption.c
> index bacce1070d..73d781729f 100644
> --- a/NetworkPkg/TcpDxe/TcpOption.c
> +++ b/NetworkPkg/TcpDxe/TcpOption.c
> @@ -342,33 +342,3 @@ TcpParseOption (
>
> return 0;
> }
> -
> -/**
> - Check the segment against PAWS.
> -
> - @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
> - @param[in] TSVal The timestamp value.
> -
> - @retval 1 The segment passed the PAWS check.
> - @retval 0 The segment failed to pass the PAWS check.
> -
> -**/
> -UINT32
> -TcpPawsOK (
> - IN TCP_CB *Tcb,
> - IN UINT32 TSVal
> - )
> -{
> - //
> - // PAWS as defined in RFC1323, buggy...
> - //
> - if (TCP_TIME_LT (TSVal, Tcb->TsRecent) &&
> - TCP_TIME_LT (Tcb->TsRecentAge + TCP_PAWS_24DAY, mTcpTick)
> - ) {
> -
> - return 0;
> -
> - }
> -
> - return 1;
> -}
> diff --git a/NetworkPkg/TcpDxe/TcpOption.h b/NetworkPkg/TcpDxe/TcpOption.h
> index 0ccadb9536..9d8581b669 100644
> --- a/NetworkPkg/TcpDxe/TcpOption.h
> +++ b/NetworkPkg/TcpDxe/TcpOption.h
> @@ -126,20 +126,4 @@ TcpParseOption (
> IN OUT TCP_OPTION *Option
> );
>
> -/**
> - Check the segment against PAWS.
> -
> - @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
> - @param[in] TSVal The timestamp value.
> -
> - @retval 1 The segment passed the PAWS check.
> - @retval 0 The segment failed to pass the PAWS check.
> -
> -**/
> -UINT32
> -TcpPawsOK (
> - IN TCP_CB *Tcb,
> - IN UINT32 TSVal
> - );
> -
> #endif
> diff --git a/NetworkPkg/TlsDxe/TlsDxe.inf b/NetworkPkg/TlsDxe/TlsDxe.inf
> index 907feb735b..bbe8c554a2 100644
> --- a/NetworkPkg/TlsDxe/TlsDxe.inf
> +++ b/NetworkPkg/TlsDxe/TlsDxe.inf
> @@ -52,7 +52,6 @@
> BaseLib
> UefiLib
> DebugLib
> - NetLib
> BaseCryptLib
> TlsLib
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> index c06b0242bb..5bbc1922a6 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> @@ -202,29 +202,6 @@ PxeBcCacheDhcp6Packet (
> return EFI_SUCCESS;
> }
>
> -
> -/**
> - Free all the nodes in the list for boot file.
> -
> - @param[in] Head The pointer to the head of list.
> -
> -**/
> -VOID
> -PxeBcFreeBootFileOption (
> - IN LIST_ENTRY *Head
> - )
> -{
> - LIST_ENTRY *Entry;
> - LIST_ENTRY *NextEntry;
> - PXEBC_DHCP6_OPTION_NODE *Node;
> -
> - NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, Head) {
> - Node = NET_LIST_USER_STRUCT (Entry, PXEBC_DHCP6_OPTION_NODE, Link);
> - RemoveEntryList (Entry);
> - FreePool (Node);
> - }
> -}
> -
> /**
> Retrieve the boot server address using the EFI_DNS6_PROTOCOL.
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> index f3dcd89743..d6e6745f0d 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> @@ -116,16 +116,6 @@ typedef struct {
> } PXEBC_DHCP6_PACKET_CACHE;
>
>
> -/**
> - Free all the nodes in the boot file list.
> -
> - @param[in] Head The pointer to the head of the list.
> -
> -**/
> -VOID
> -PxeBcFreeBootFileOption (
> - IN LIST_ENTRY *Head
> - );
>
>
> /**
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] NetworkPkg: Remove the redundant code and definition.
2018-08-13 2:45 Songpeng Li
2018-08-13 4:42 ` Fu, Siyuan
@ 2018-08-14 15:14 ` Laszlo Ersek
2018-08-15 0:45 ` Wu, Jiaxin
2 siblings, 0 replies; 5+ messages in thread
From: Laszlo Ersek @ 2018-08-14 15:14 UTC (permalink / raw)
To: Songpeng Li, edk2-devel; +Cc: Siyuan Fu, Jiaxin Wu
On 08/13/18 04:45, Songpeng Li wrote:
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li <songpeng.li@intel.com>
> ---
> 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 <lersek@redhat.com>
Please fragment the patch to a series so that each patch modify only one
module under NetworkPkg. References:
http://mid.mail-archive.com/4A89E2EF3DFEDB4C8BFDE51014F606A14E2C6745@SHSMSX104.ccr.corp.intel.com
http://mid.mail-archive.com/20180808084712.34696-1-shenglei.zhang@intel.com
Laszlo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] NetworkPkg: Remove the redundant code and definition.
2018-08-13 2:45 Songpeng Li
2018-08-13 4:42 ` Fu, Siyuan
2018-08-14 15:14 ` Laszlo Ersek
@ 2018-08-15 0:45 ` Wu, Jiaxin
2 siblings, 0 replies; 5+ messages in thread
From: Wu, Jiaxin @ 2018-08-15 0:45 UTC (permalink / raw)
To: Li, Songpeng, edk2-devel@lists.01.org; +Cc: Fu, Siyuan
Looks good to me.
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
> -----Original Message-----
> From: Li, Songpeng
> Sent: Monday, August 13, 2018 10:45 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>
> Subject: [PATCH] NetworkPkg: Remove the redundant code and definition.
>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1064
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Songpeng Li <songpeng.li@intel.com>
> ---
> 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 UINT8 IkeType
> - )
> -{
> - 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] Mid The 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.
> -
> -**/
> -EFI_STATUS
> -Ikev2ChildSaSessionOnDeleting (
> - IN IKEV2_CHILD_SA_SESSION *ChildSaSession
> - )
> -{
> - return EFI_SUCCESS;
> -}
> -
> /**
> Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
>
> @@ -1137,24 +1079,6 @@ Ikev2ChildSaAssociateSpdEntry (
> }
>
>
> -/**
> - This function finds the SPI from Create Child SA Exchange Packet.
> -
> - @param[in] IkePacket Pointer to IKE_PACKET to be searched.
> -
> - @retval SPI number or 0 if it is not supported.
> -
> -**/
> -UINT32
> -Ikev2ChildExchangeRekeySpi (
> - IN IKE_PACKET *IkePacket
> - )
> -{
> - //
> - // Not support yet.
> - //
> - return 0;
> -}
>
> /**
> Validate the IKE header of received IKE packet.
> diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> index 8383ff8dd6..79def7740d 100644
> --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.h
> @@ -104,19 +104,6 @@ Ikev2SaSessionRemove (
> );
>
>
> -/**
> - 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
> - );
> -
> /**
> After IKE/Child SA is estiblished, close the time event and free sent packet.
>
> @@ -211,20 +198,6 @@ Ikev2ChildSaSessionLookupBySpi (
> IN UINT32 Spi
> );
>
> -/**
> - Find the ChildSaSession by it's MessagId.
> -
> - @param[in] SaSessionList Pointer to a ChildSaSession List.
> - @param[in] Mid The messageId used to search ChildSaSession.
> -
> - @return Pointer to IKEV2_CHILD_SA_SESSION.
> -
> -**/
> -IKEV2_CHILD_SA_SESSION *
> -Ikev2ChildSaSessionLookupByMid (
> - IN LIST_ENTRY *SaSessionList,
> - IN UINT32 Mid
> - );
>
> /**
> Insert a Child SA Session into the specified ChildSa list..
> @@ -257,18 +230,6 @@ Ikev2ChildSaSessionRemove (
> IN UINT8 ListType
> );
>
> -/**
> - Mark a specified Child SA Session as on deleting.
> -
> - @param[in] ChildSaSession Pointer to IKEV2_CHILD_SA_SESSION.
> -
> - @retval EFI_SUCCESS Operation is successful.
> -
> -**/
> -EFI_STATUS
> -Ikev2ChildSaSessionOnDeleting (
> - IN IKEV2_CHILD_SA_SESSION *ChildSaSession
> - );
>
> /**
> Free the memory located for the specified IKEV2_CHILD_SA_SESSION.
> @@ -328,19 +289,6 @@ Ikev2ChildExchangeRequestType(
> IN IKE_PACKET *IkePacket
> );
>
> -/**
> - This function finds the SPI from Create Child Sa Exchange Packet.
> -
> - @param[in] IkePacket Pointer to IKE_PACKET to be searched.
> -
> - @retval SPI number.
> -
> -**/
> -UINT32
> -Ikev2ChildExchangeRekeySpi(
> - IN IKE_PACKET *IkePacket
> - );
> -
>
> /**
> Associate a SPD selector to the Child SA Session.
> @@ -882,21 +830,6 @@ Ikev2DecodePacket (
> IN UINTN IkeType
> );
>
> -/**
> - 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 UINT8 IkeType
> - );
>
> /**
> Send out IKEV2 packet.
> diff --git a/NetworkPkg/TcpDxe/TcpOption.c
> b/NetworkPkg/TcpDxe/TcpOption.c
> index bacce1070d..73d781729f 100644
> --- a/NetworkPkg/TcpDxe/TcpOption.c
> +++ b/NetworkPkg/TcpDxe/TcpOption.c
> @@ -342,33 +342,3 @@ TcpParseOption (
>
> return 0;
> }
> -
> -/**
> - Check the segment against PAWS.
> -
> - @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
> - @param[in] TSVal The timestamp value.
> -
> - @retval 1 The segment passed the PAWS check.
> - @retval 0 The segment failed to pass the PAWS check.
> -
> -**/
> -UINT32
> -TcpPawsOK (
> - IN TCP_CB *Tcb,
> - IN UINT32 TSVal
> - )
> -{
> - //
> - // PAWS as defined in RFC1323, buggy...
> - //
> - if (TCP_TIME_LT (TSVal, Tcb->TsRecent) &&
> - TCP_TIME_LT (Tcb->TsRecentAge + TCP_PAWS_24DAY, mTcpTick)
> - ) {
> -
> - return 0;
> -
> - }
> -
> - return 1;
> -}
> diff --git a/NetworkPkg/TcpDxe/TcpOption.h
> b/NetworkPkg/TcpDxe/TcpOption.h
> index 0ccadb9536..9d8581b669 100644
> --- a/NetworkPkg/TcpDxe/TcpOption.h
> +++ b/NetworkPkg/TcpDxe/TcpOption.h
> @@ -126,20 +126,4 @@ TcpParseOption (
> IN OUT TCP_OPTION *Option
> );
>
> -/**
> - Check the segment against PAWS.
> -
> - @param[in] Tcb Pointer to the TCP_CB of this TCP instance.
> - @param[in] TSVal The timestamp value.
> -
> - @retval 1 The segment passed the PAWS check.
> - @retval 0 The segment failed to pass the PAWS check.
> -
> -**/
> -UINT32
> -TcpPawsOK (
> - IN TCP_CB *Tcb,
> - IN UINT32 TSVal
> - );
> -
> #endif
> diff --git a/NetworkPkg/TlsDxe/TlsDxe.inf b/NetworkPkg/TlsDxe/TlsDxe.inf
> index 907feb735b..bbe8c554a2 100644
> --- a/NetworkPkg/TlsDxe/TlsDxe.inf
> +++ b/NetworkPkg/TlsDxe/TlsDxe.inf
> @@ -52,7 +52,6 @@
> BaseLib
> UefiLib
> DebugLib
> - NetLib
> BaseCryptLib
> TlsLib
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> index c06b0242bb..5bbc1922a6 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c
> @@ -202,29 +202,6 @@ PxeBcCacheDhcp6Packet (
> return EFI_SUCCESS;
> }
>
> -
> -/**
> - Free all the nodes in the list for boot file.
> -
> - @param[in] Head The pointer to the head of list.
> -
> -**/
> -VOID
> -PxeBcFreeBootFileOption (
> - IN LIST_ENTRY *Head
> - )
> -{
> - LIST_ENTRY *Entry;
> - LIST_ENTRY *NextEntry;
> - PXEBC_DHCP6_OPTION_NODE *Node;
> -
> - NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, Head) {
> - Node = NET_LIST_USER_STRUCT (Entry, PXEBC_DHCP6_OPTION_NODE,
> Link);
> - RemoveEntryList (Entry);
> - FreePool (Node);
> - }
> -}
> -
> /**
> Retrieve the boot server address using the EFI_DNS6_PROTOCOL.
>
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> index f3dcd89743..d6e6745f0d 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h
> @@ -116,16 +116,6 @@ typedef struct {
> } PXEBC_DHCP6_PACKET_CACHE;
>
>
> -/**
> - Free all the nodes in the boot file list.
> -
> - @param[in] Head The pointer to the head of the list.
> -
> -**/
> -VOID
> -PxeBcFreeBootFileOption (
> - IN LIST_ENTRY *Head
> - );
>
>
> /**
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-08-15 0:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180809083322.7888-1-songpeng.li@intel.com>
2018-08-13 4:43 ` [PATCH] NetworkPkg: Remove the redundant code and definition Fu, Siyuan
2018-08-13 2:45 Songpeng Li
2018-08-13 4:42 ` Fu, Siyuan
2018-08-14 15:14 ` Laszlo Ersek
2018-08-15 0:45 ` Wu, Jiaxin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox