From 0a7294f7a158eb10cad794a296834e14b9d3a655 Mon Sep 17 00:00:00 2001
From: qianouyang <qianouyang@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 20 Apr 2011 10:01:48 +0000
Subject: Update the relevant drivers to use the correct GUID for
 EFI_IPSEC2_PROTOCOL.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11576 6f19259b-4bc3-4df7-8a09-765794883524
---
 NetworkPkg/IpSecDxe/IpSecDriver.c | 18 +++++++++---------
 NetworkPkg/IpSecDxe/IpSecDxe.inf  |  2 +-
 NetworkPkg/IpSecDxe/IpSecImpl.h   |  2 +-
 NetworkPkg/IpSecDxe/IpSecMain.c   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'NetworkPkg/IpSecDxe')

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.
-- 
cgit v1.2.3