summaryrefslogtreecommitdiff
path: root/NetworkPkg
diff options
context:
space:
mode:
Diffstat (limited to 'NetworkPkg')
-rw-r--r--NetworkPkg/Application/IpsecConfig/IpSecConfig.c2
-rw-r--r--NetworkPkg/Application/IpsecConfig/IpSecConfig.inf2
-rw-r--r--NetworkPkg/Ip6Dxe/Ip6Dxe.inf2
-rw-r--r--NetworkPkg/Ip6Dxe/Ip6Input.c2
-rw-r--r--NetworkPkg/IpSecDxe/IpSecDriver.c18
-rw-r--r--NetworkPkg/IpSecDxe/IpSecDxe.inf2
-rw-r--r--NetworkPkg/IpSecDxe/IpSecImpl.h2
-rw-r--r--NetworkPkg/IpSecDxe/IpSecMain.c2
8 files changed, 16 insertions, 16 deletions
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index f64cf9728e..44a1a0cbd4 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -648,7 +648,7 @@ InitializeIpSecConfig (
goto Done;
}
- Status = LocateProtocol (&gEfiIpSecProtocolGuid, (VOID **) &mIpSec);
+ Status = LocateProtocol (&gEfiIpSec2ProtocolGuid, (VOID **) &mIpSec);
if (EFI_ERROR (Status) || mIpSec == NULL) {
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_PROTOCOL_INEXISTENT), mHiiHandle, mAppName);
goto Done;
diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf b/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf
index 1e0d4f44db..19a867957d 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf
@@ -57,5 +57,5 @@
UefiLib
[Protocols]
- gEfiIpSecProtocolGuid ##CONSUMS
+ gEfiIpSec2ProtocolGuid ##CONSUMS
gEfiIpSecConfigProtocolGuid ##CONSUMS
diff --git a/NetworkPkg/Ip6Dxe/Ip6Dxe.inf b/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
index aeb341cdc3..1510927e4b 100644
--- a/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+++ b/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
@@ -93,7 +93,7 @@
gEfiIp6ConfigProtocolGuid
gEfiDhcp6ServiceBindingProtocolGuid
gEfiDhcp6ProtocolGuid
- gEfiIpSecProtocolGuid
+ gEfiIpSec2ProtocolGuid
gEfiHiiConfigAccessProtocolGuid
[Guids]
diff --git a/NetworkPkg/Ip6Dxe/Ip6Input.c b/NetworkPkg/Ip6Dxe/Ip6Input.c
index 55f0ae869a..89cdc35542 100644
--- a/NetworkPkg/Ip6Dxe/Ip6Input.c
+++ b/NetworkPkg/Ip6Dxe/Ip6Input.c
@@ -536,7 +536,7 @@ Ip6IpSecProcessPacket (
ZeroMem (&ZeroHead, sizeof (EFI_IP6_HEADER));
if (mIpSec == NULL) {
- gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &mIpSec);
+ gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &mIpSec);
//
// Check whether the ipsec protocol is available.
diff --git a/NetworkPkg/IpSecDxe/IpSecDriver.c b/NetworkPkg/IpSecDxe/IpSecDriver.c
index 7e0d1fa4ed..bd12aa2e07 100644
--- a/NetworkPkg/IpSecDxe/IpSecDriver.c
+++ b/NetworkPkg/IpSecDxe/IpSecDriver.c
@@ -94,7 +94,7 @@ IpSecDriverBindingStart (
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
)
{
- EFI_IPSEC_PROTOCOL *IpSec;
+ EFI_IPSEC2_PROTOCOL *IpSec;
EFI_STATUS Status;
EFI_STATUS Udp4Status;
EFI_STATUS Udp6Status;
@@ -103,7 +103,7 @@ IpSecDriverBindingStart (
//
// Ipsec protocol should be installed when load image.
//
- Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec);
+ Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);
if (EFI_ERROR (Status)) {
return Status;
@@ -171,7 +171,7 @@ IpSecDriverBindingStop (
IN EFI_HANDLE *ChildHandleBuffer
)
{
- EFI_IPSEC_PROTOCOL *IpSec;
+ EFI_IPSEC2_PROTOCOL *IpSec;
EFI_STATUS Status;
IPSEC_PRIVATE_DATA *Private;
IKE_UDP_SERVICE *UdpSrv;
@@ -181,7 +181,7 @@ IpSecDriverBindingStop (
//
// Locate ipsec protocol to get private data.
//
- Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec);
+ Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);
if (EFI_ERROR (Status)) {
return Status;
@@ -301,12 +301,12 @@ IpSecDriverEntryPoint (
{
EFI_STATUS Status;
IPSEC_PRIVATE_DATA *Private;
- EFI_IPSEC_PROTOCOL *IpSec;
+ EFI_IPSEC2_PROTOCOL *IpSec;
//
// Check whether ipsec protocol has already been installed.
//
- Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec);
+ Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);
if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_WARN, "_ModuleEntryPoint: IpSec has been already loaded\n"));
@@ -345,7 +345,7 @@ IpSecDriverEntryPoint (
Private->Signature = IPSEC_PRIVATE_DATA_SIGNATURE;
Private->ImageHandle = ImageHandle;
- CopyMem (&Private->IpSec, &mIpSecInstance, sizeof (EFI_IPSEC_PROTOCOL));
+ CopyMem (&Private->IpSec, &mIpSecInstance, sizeof (EFI_IPSEC2_PROTOCOL));
//
// Initilize Private's members. Thess members is used for IKE.
@@ -371,7 +371,7 @@ IpSecDriverEntryPoint (
//
Status = gBS->InstallMultipleProtocolInterfaces (
&Private->Handle,
- &gEfiIpSecProtocolGuid,
+ &gEfiIpSec2ProtocolGuid,
&Private->IpSec,
NULL
);
@@ -396,7 +396,7 @@ IpSecDriverEntryPoint (
ON_UNINSTALL_IPSEC:
gBS->UninstallProtocolInterface (
Private->Handle,
- &gEfiIpSecProtocolGuid,
+ &gEfiIpSec2ProtocolGuid,
&Private->IpSec
);
ON_UNINSTALL_CONFIG:
diff --git a/NetworkPkg/IpSecDxe/IpSecDxe.inf b/NetworkPkg/IpSecDxe/IpSecDxe.inf
index 208a0443c6..2fcaeace78 100644
--- a/NetworkPkg/IpSecDxe/IpSecDxe.inf
+++ b/NetworkPkg/IpSecDxe/IpSecDxe.inf
@@ -89,7 +89,7 @@
gEfiUdp6ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp6ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIpSecConfigProtocolGuid # PROTOCOL ALWAYS_PRODUCED
- gEfiIpSecProtocolGuid # PROTOCOL ALWAYS_PRODUCED
+ gEfiIpSec2ProtocolGuid # PROTOCOL ALWAYS_PRODUCED
[Pcd]
gEfiNetworkPkgTokenSpaceGuid.PcdIpsecCertificateEnabled
diff --git a/NetworkPkg/IpSecDxe/IpSecImpl.h b/NetworkPkg/IpSecDxe/IpSecImpl.h
index 47805f3b9f..4237119d93 100644
--- a/NetworkPkg/IpSecDxe/IpSecImpl.h
+++ b/NetworkPkg/IpSecDxe/IpSecImpl.h
@@ -346,7 +346,7 @@ IpSecLookupSadBySpi (
The behavior is that it can perform one of the following actions:
bypass the packet, discard the packet, or protect the packet.
- @param[in] This Pointer to the EFI_IPSEC_PROTOCOL instance.
+ @param[in] This Pointer to the EFI_IPSEC2_PROTOCOL instance.
@param[in] NicHandle Instance of the network interface.
@param[in] IpVersion IPV4 or IPV6.
@param[in, out] IpHead Pointer to the IP Header.
diff --git a/NetworkPkg/IpSecDxe/IpSecMain.c b/NetworkPkg/IpSecDxe/IpSecMain.c
index 247dab3381..f98f809ab8 100644
--- a/NetworkPkg/IpSecDxe/IpSecMain.c
+++ b/NetworkPkg/IpSecDxe/IpSecMain.c
@@ -25,7 +25,7 @@ EFI_IPSEC2_PROTOCOL mIpSecInstance = { IpSecProcess, NULL, TRUE };
The behavior is that it can perform one of the following actions:
bypass the packet, discard the packet, or protect the packet.
- @param[in] This Pointer to the EFI_IPSEC_PROTOCOL instance.
+ @param[in] This Pointer to the EFI_IPSEC2_PROTOCOL instance.
@param[in] NicHandle Instance of the network interface.
@param[in] IpVersion IPV4 or IPV6.
@param[in, out] IpHead Pointer to the IP Header.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 22:13:57 +0000