summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MdeModulePkg/Include/Library/NetLib.h41
-rw-r--r--MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c7
-rw-r--r--MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf1
-rw-r--r--MdeModulePkg/Library/DxeNetLib/DxeNetLib.c76
-rw-r--r--MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf9
-rw-r--r--MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c5
-rw-r--r--MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf3
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf3
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c6
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h1
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c4
-rw-r--r--MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c6
-rw-r--r--MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h1
-rw-r--r--MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf3
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf3
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c6
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c8
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h1
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c2
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h1
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf3
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c4
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c6
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h1
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c2
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf3
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c4
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h1
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c4
-rw-r--r--MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c4
-rw-r--r--MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h1
-rw-r--r--MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf5
33 files changed, 53 insertions, 174 deletions
diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index c1519fea23..7addeeef79 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _NET_LIB_H_
#define _NET_LIB_H_
-#include <Protocol/Dpc.h>
-
typedef UINT32 IP4_ADDR;
typedef UINT32 TCP_SEQNO;
typedef UINT16 TCP_PORTNO;
@@ -821,45 +819,6 @@ NetLibGetNicHandle (
);
/**
- Add a Deferred Procedure Call to the end of the DPC queue.
-
- @param[in] DpcTpl The EFI_TPL that the DPC should be invoked.
- @param[in] DpcProcedure Pointer to the DPC's function.
- @param[in] DpcContext Pointer to the DPC's context. Passed to DpcProcedure
- when DpcProcedure is invoked.
-
- @retval EFI_SUCCESS The DPC was queued.
- @retval EFI_INVALID_PARAMETER DpcTpl is not a valid EFI_TPL, or DpcProcedure
- is NULL.
- @retval EFI_OUT_OF_RESOURCES There are not enough resources available to
- add the DPC to the queue.
-
-**/
-EFI_STATUS
-EFIAPI
-NetLibQueueDpc (
- IN EFI_TPL DpcTpl,
- IN EFI_DPC_PROCEDURE DpcProcedure,
- IN VOID *DpcContext OPTIONAL
- );
-
-/**
- Dispatch the queue of DPCs. ALL DPCs that have been queued with a DpcTpl
- value greater than or equal to the current TPL are invoked in the order that
- they were queued. DPCs with higher DpcTpl values are invoked before DPCs with
- lower DpcTpl values.
-
- @retval EFI_SUCCESS One or more DPCs were invoked.
- @retval EFI_NOT_FOUND No DPCs were invoked.
-
-**/
-EFI_STATUS
-EFIAPI
-NetLibDispatchDpc (
- VOID
- );
-
-/**
This is the default unload handle for all the network drivers.
Disconnect the driver specified by ImageHandle from all the devices in the handle database.
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index c3dc515c45..0843173a64 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/BaseMemoryLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/MemoryAllocationLib.h>
+#include <Library/DpcLib.h>
LIST_ENTRY mActiveIpIoList = {
@@ -564,7 +565,7 @@ IpIoTransmitHandler (
//
// Request IpIoTransmitHandlerDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, IpIoTransmitHandlerDpc, Context);
+ QueueDpc (TPL_CALLBACK, IpIoTransmitHandlerDpc, Context);
}
@@ -618,7 +619,7 @@ IpIoDummyHandler (
//
// Request IpIoDummyHandlerDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, IpIoDummyHandlerDpc, Context);
+ QueueDpc (TPL_CALLBACK, IpIoDummyHandlerDpc, Context);
}
@@ -738,7 +739,7 @@ IpIoListenHandler (
//
// Request IpIoListenHandlerDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, IpIoListenHandlerDpc, Context);
+ QueueDpc (TPL_CALLBACK, IpIoListenHandlerDpc, Context);
}
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
index 1e812c8f83..1e83b67df7 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
@@ -45,3 +45,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
UefiBootServicesTableLib
MemoryAllocationLib
BaseMemoryLib
+ DpcLib
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 32c81c17b7..f18aa41e34 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/HiiConfigRouting.h>
#include <Protocol/ComponentName.h>
#include <Protocol/ComponentName2.h>
-#include <Protocol/Dpc.h>
#include <Guid/NicIp4ConfigNvData.h>
@@ -34,8 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/HiiLib.h>
#include <Library/PrintLib.h>
-EFI_DPC_PROTOCOL *mDpc = NULL;
-
GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mNetLibHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
#define NIC_ITEM_CONFIG_SIZE sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE
@@ -1458,76 +1455,3 @@ NetLibGetNicHandle (
gBS->FreePool (OpenBuffer);
return Handle;
}
-
-/**
- Add a Deferred Procedure Call to the end of the DPC queue.
-
- @param[in] DpcTpl The EFI_TPL that the DPC should be invoked.
- @param[in] DpcProcedure Pointer to the DPC's function.
- @param[in] DpcContext Pointer to the DPC's context. Passed to DpcProcedure
- when DpcProcedure is invoked.
-
- @retval EFI_SUCCESS The DPC was queued.
- @retval EFI_INVALID_PARAMETER DpcTpl is not a valid EFI_TPL, or DpcProcedure
- is NULL.
- @retval EFI_OUT_OF_RESOURCES There are not enough resources available to
- add the DPC to the queue.
-
-**/
-EFI_STATUS
-EFIAPI
-NetLibQueueDpc (
- IN EFI_TPL DpcTpl,
- IN EFI_DPC_PROCEDURE DpcProcedure,
- IN VOID *DpcContext OPTIONAL
- )
-{
- return mDpc->QueueDpc (mDpc, DpcTpl, DpcProcedure, DpcContext);
-}
-
-/**
- Dispatch the queue of DPCs. ALL DPCs that have been queued with a DpcTpl
- value greater than or equal to the current TPL are invoked in the order that
- they were queued. DPCs with higher DpcTpl values are invoked before DPCs with
- lower DpcTpl values.
-
- @retval EFI_SUCCESS One or more DPCs were invoked.
- @retval EFI_NOT_FOUND No DPCs were invoked.
-
-**/
-EFI_STATUS
-EFIAPI
-NetLibDispatchDpc (
- VOID
- )
-{
- return mDpc->DispatchDpc(mDpc);
-}
-
-/**
- The constructor function caches the pointer to DPC protocol.
-
- The constructor function locates DPC protocol from protocol database.
- It will ASSERT() if that operation fails and it will always return EFI_SUCCESS.
-
- @param[in] ImageHandle The firmware allocated handle for the EFI image.
- @param[in] SystemTable A pointer to the EFI System Table.
-
- @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS.
-
-**/
-EFI_STATUS
-EFIAPI
-NetLibConstructor (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
- )
-{
- EFI_STATUS Status;
-
- Status = gBS->LocateProtocol (&gEfiDpcProtocolGuid, NULL, (VOID**) &mDpc);
- ASSERT_EFI_ERROR (Status);
- ASSERT (mDpc != NULL);
-
- return Status;
-}
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
index 2f2b2d095f..05d68d70e0 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
VERSION_STRING = 1.0
LIBRARY_CLASS = NetLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
- CONSTRUCTOR = NetLibConstructor
-
#
# The following information is for reference only and not required by the build tools.
#
@@ -52,15 +50,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
PrintLib
[Guids]
- gEfiNicIp4ConfigVariableGuid
+ gEfiNicIp4ConfigVariableGuid
[Protocols]
gEfiSimpleNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
- gEfiDpcProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiComponentNameProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiComponentName2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiHiiConfigRoutingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-
-[Depex]
- gEfiDpcProtocolGuid
- \ No newline at end of file
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index 3e95393221..91e211a9bd 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/UefiBootServicesTableLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/DpcLib.h>
/**
@@ -96,7 +97,7 @@ UdpIoOnDgramSent (
//
// Request UdpIoOnDgramSentDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, UdpIoOnDgramSentDpc, Context);
+ QueueDpc (TPL_CALLBACK, UdpIoOnDgramSentDpc, Context);
}
/**
@@ -214,7 +215,7 @@ UdpIoOnDgramRcvd (
//
// Request UdpIoOnDgramRcvdDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, UdpIoOnDgramRcvdDpc, Context);
+ QueueDpc (TPL_CALLBACK, UdpIoOnDgramRcvdDpc, Context);
}
/**
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index 27e1bbd1d3..1a6115615d 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
@@ -45,7 +45,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
UefiBootServicesTableLib
MemoryAllocationLib
BaseMemoryLib
+ DpcLib
[Protocols]
gEfiUdp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
- gEfiUdp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED \ No newline at end of file
+ gEfiUdp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index 21ad6e16e4..a3b2427463 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
@@ -52,11 +52,10 @@
UefiDriverEntryPoint
DebugLib
NetLib
-
+ DpcLib
[Protocols]
gEfiManagedNetworkServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index a3923d95bd..9704f2139c 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -325,7 +325,7 @@ ArpOnFrameRcvd (
//
// Request ArpOnFrameRcvdDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, ArpOnFrameRcvdDpc, Context);
+ QueueDpc (TPL_CALLBACK, ArpOnFrameRcvdDpc, Context);
}
/**
@@ -386,7 +386,7 @@ ArpOnFrameSent (
//
// Request ArpOnFrameSentDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, ArpOnFrameSentDpc, Context);
+ QueueDpc (TPL_CALLBACK, ArpOnFrameSentDpc, Context);
}
@@ -812,7 +812,7 @@ ArpAddressResolved (
//
// Dispatch the DPCs queued by the NotifyFunction of the Context->UserRequestEvent.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
return Count;
}
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
index 77873dc674..bc9128d33b 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
+#include <Library/DpcLib.h>
//
// Ethernet protocol type definitions.
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
index ac76fcd632..0f66580bec 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
@@ -668,7 +668,7 @@ SIGNAL_USER:
//
// Dispatch the DPC queued by the NotifyFunction of ResolvedEvent.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
}
return Status;
@@ -737,7 +737,7 @@ ArpCancel (
// Dispatch the DPCs queued by the NotifyFunction of the events signaled
// by ArpCancleRequest.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
gBS->RestoreTPL (OldTpl);
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
index ed130d9c88..fa0445e247 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
@@ -219,7 +219,7 @@ EfiNicIp4ConfigSetInfo (
//
if (Reconfig && (Instance->ReconfigEvent != NULL)) {
Status = gBS->SignalEvent (Instance->ReconfigEvent);
- NetLibDispatchDpc ();
+ DispatchDpc ();
}
return Status;
@@ -335,7 +335,7 @@ ON_EXIT:
gBS->SignalEvent (Instance->DoneEvent);
Ip4ConfigCleanDhcp4 (Instance);
- NetLibDispatchDpc ();
+ DispatchDpc ();
return ;
}
@@ -538,7 +538,7 @@ ON_ERROR:
ON_EXIT:
gBS->RestoreTPL (OldTpl);
- NetLibDispatchDpc ();
+ DispatchDpc ();
return Status;
}
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
index c685fc7443..8cc789d273 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
@@ -37,6 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/MemoryAllocationLib.h>
#include <Library/HiiLib.h>
#include <Library/PrintLib.h>
+#include <Library/DpcLib.h>
#include "NicIp4Variable.h"
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
index 8a3aed75d3..2fe1b3bd90 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
@@ -60,7 +60,7 @@
NetLib
HiiLib
PrintLib
-
+ DpcLib
[Protocols]
gEfiDhcp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
@@ -74,4 +74,3 @@
[Guids]
gEfiIfrTianoGuid ## CONSUMES ## Guid
gEfiNicIp4ConfigVariableGuid ## CONSUMES ## Guid
- \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index bd9946dd5f..121fb17b77 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -70,7 +70,7 @@
UefiRuntimeServicesTableLib
DebugLib
NetLib
-
+ DpcLib
[Protocols]
gEfiIp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
@@ -80,4 +80,3 @@
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index dd2674d224..24727b0516 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -871,7 +871,7 @@ Ip4OnArpResolved (
//
// Request Ip4OnArpResolvedDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, Ip4OnArpResolvedDpc, Context);
+ QueueDpc (TPL_CALLBACK, Ip4OnArpResolvedDpc, Context);
}
@@ -924,7 +924,7 @@ Ip4OnFrameSent (
//
// Request Ip4OnFrameSentDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, Ip4OnFrameSentDpc, Context);
+ QueueDpc (TPL_CALLBACK, Ip4OnFrameSentDpc, Context);
}
@@ -1187,7 +1187,7 @@ Ip4OnFrameReceived (
//
// Request Ip4OnFrameReceivedDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, Ip4OnFrameReceivedDpc, Context);
+ QueueDpc (TPL_CALLBACK, Ip4OnFrameReceivedDpc, Context);
}
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 84a39656f6..714f3d9b82 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -703,7 +703,7 @@ Ip4AutoConfigCallBack (
//
// Request Ip4AutoConfigCallBackDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, Ip4AutoConfigCallBackDpc, Context);
+ QueueDpc (TPL_CALLBACK, Ip4AutoConfigCallBackDpc, Context);
}
@@ -1780,7 +1780,7 @@ Ip4FreeTxToken (
//
// Dispatch the DPC queued by the NotifyFunction of Token->Event.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
}
gBS->FreePool (Wrap);
@@ -2110,7 +2110,7 @@ EfiIp4Receive (
// Dispatch the DPC queued by the NotifyFunction of this instane's receive
// event.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
ON_EXIT:
gBS->RestoreTPL (OldTpl);
@@ -2266,7 +2266,7 @@ Ip4Cancel (
// Dispatch the DPCs queued by the NotifyFunction of the canceled rx token's
// events.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
if (EFI_ERROR (Status)) {
if ((Token != NULL) && (Status == EFI_ABORTED)) {
return EFI_SUCCESS;
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index 9de326f47a..615e5ae2a8 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
@@ -31,6 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/NetLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
+#include <Library/DpcLib.h>
#include "Ip4Common.h"
#include "Ip4Driver.h"
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 964fb96a79..b495e75deb 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -592,7 +592,7 @@ Ip4AccpetFrame (
// Dispatch the DPCs queued by the NotifyFunction of the rx token's events
// which are signaled with received data.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
RESTART:
Ip4ReceiveFrame (IpSb->DefaultInterface, NULL, Ip4AccpetFrame, IpSb);
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
index 3fc7da1920..b015304061 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
@@ -27,6 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
#include <Library/NetLib.h>
+#include <Library/DpcLib.h>
#include "ComponentName.h"
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index 058a9c4562..a03592bfb8 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
@@ -54,10 +54,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
UefiDriverEntryPoint
DebugLib
NetLib
-
+ DpcLib
[Protocols]
gEfiManagedNetworkServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiSimpleNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index 57b1f7b5bc..0c8196a768 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -282,7 +282,7 @@ SIGNAL_TOKEN:
//
// Dispatch the DPC queued by the NotifyFunction of Token->Event.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
return EFI_SUCCESS;
}
@@ -1064,5 +1064,5 @@ MnpSystemPoll (
//
// Dispatch the DPC queued by the NotifyFunction of rx token's events.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
}
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
index f93ee6ab77..79ea478914 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
@@ -632,7 +632,7 @@ MnpReceive (
//
// Dispatch the DPC queued by the NotifyFunction of Token->Event.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
}
ON_EXIT:
@@ -709,7 +709,7 @@ MnpCancel (
//
// Dispatch the DPC queued by the NotifyFunction of the cancled token's events.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
ON_EXIT:
gBS->RestoreTPL (OldTpl);
@@ -774,7 +774,7 @@ MnpPoll (
//
// Dispatch the DPC queued by the NotifyFunction of rx token's events.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
ON_EXIT:
gBS->RestoreTPL (OldTpl);
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
index 601db1548a..a5576a5aad 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
@@ -29,6 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/UefiLib.h>
+#include <Library/DpcLib.h>
#define SOCK_SND_BUF 0
#define SOCK_RCV_BUF 1
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index 3b9880d38d..cdb35dc2ff 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
@@ -70,10 +70,10 @@
NetLib
IpIoLib
DevicePathLib
+ DpcLib
[Protocols]
gEfiIp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiTcp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiTcp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index 2d2c27614d..91e763c486 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
@@ -577,6 +577,6 @@ TcpTicking (
IN VOID *Context
)
{
- NetLibQueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);
+ QueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);
}
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index c39ac1350b..d1c06f3bf1 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
@@ -56,11 +56,10 @@
DebugLib
IpIoLib
NetLib
-
+ DpcLib
[Protocols]
gEfiIp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index 0f14021e23..292673d88b 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -1007,7 +1007,7 @@ Udp4DgramSent (
//
Token->Status = Status;
gBS->SignalEvent (Token->Event);
- NetLibDispatchDpc ();
+ DispatchDpc ();
}
}
@@ -1054,7 +1054,7 @@ Udp4DgramRcvd (
// Dispatch the DPC queued by the NotifyFunction of the rx token's events
// which are signaled with received data.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
}
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
index 9772b29e2f..82b21de971 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h>
+#include <Library/DpcLib.h>
#include "Udp4Driver.h"
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
index f3ff95463c..7bb83b06f6 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
@@ -783,7 +783,7 @@ Udp4Receive (
//
// Dispatch the DPC queued by the NotifyFunction of Token->Event.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
ON_EXIT:
@@ -856,7 +856,7 @@ Udp4Cancel (
//
// Dispatch the DPC queued by the NotifyFunction of the cancelled token's events.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
gBS->RestoreTPL (OldTpl);
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 4a91f1c3d1..3eeacdcc5c 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -240,7 +240,7 @@ IcmpErrorListenHandler (
//
// Request IpIoListenHandlerDpc as a DPC at TPL_CALLBACK
//
- NetLibQueueDpc (TPL_CALLBACK, IcmpErrorListenHandlerDpc, Context);
+ QueueDpc (TPL_CALLBACK, IcmpErrorListenHandlerDpc, Context);
}
/**
@@ -473,7 +473,7 @@ EfiPxeBcStop (
// Dispatch the DPCs queued by the NotifyFunction of the canceled rx token's
// events.
//
- NetLibDispatchDpc ();
+ DispatchDpc ();
Private->Ip4->Configure (Private->Ip4, NULL);
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
index adc205b347..bc039ec730 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
@@ -39,6 +39,7 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DATA;
#include <Library/UefiLib.h>
#include <Library/BaseLib.h>
#include <Library/NetLib.h>
+#include <Library/DpcLib.h>
#include "PxeBcDriver.h"
#include "PxeArch.h"
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index b070f161cb..7f8acd73d4 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -74,13 +74,11 @@
MemoryAllocationLib
DebugLib
NetLib
-
+ DpcLib
[Guids]
gEfiSmbiosTableGuid # ALWAYS_CONSUMED
-
-
[Protocols]
gEfiArpServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED
@@ -96,4 +94,3 @@
gEfiNetworkInterfaceIdentifierProtocolGuid_31 ## SOMETIMES_CONSUMES
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-