From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 3 Jan 2011 03:17:20 +0000 (+0000)
Subject: NetworkPkg/IpSecDxe: Add missing EFIAPI for callback functions
X-Git-Tag: edk2-stable201903~15254
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=1d8fa5e94fcf76de0c3e763576a0637ad7af362f

NetworkPkg/IpSecDxe: Add missing EFIAPI for callback functions

Callback functions must always use EFIAPI.

GCC 4.4 X64 flagged these mismatches in EFIAPI usage.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11221 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/NetworkPkg/IpSecDxe/IkePacket.c b/NetworkPkg/IpSecDxe/IkePacket.c
index fa29d54876..8fd395d43f 100644
--- a/NetworkPkg/IpSecDxe/IkePacket.c
+++ b/NetworkPkg/IpSecDxe/IkePacket.c
@@ -99,6 +99,7 @@ IkePacketFree (
 
 **/
 VOID
+EFIAPI
 IkePacketNetbufFree (
   IN VOID  *Arg
   )
diff --git a/NetworkPkg/IpSecDxe/IkeService.c b/NetworkPkg/IpSecDxe/IkeService.c
index 0550534f9c..0b2d212d68 100644
--- a/NetworkPkg/IpSecDxe/IkeService.c
+++ b/NetworkPkg/IpSecDxe/IkeService.c
@@ -116,6 +116,7 @@ IkeLookupUdp (
 
 **/
 EFI_STATUS
+EFIAPI
 IkeConfigUdp4 (
   IN UDP_IO                 *UdpIo,
   IN VOID                   *Context
@@ -157,6 +158,7 @@ IkeConfigUdp4 (
 
 **/
 EFI_STATUS
+EFIAPI
 IkeConfigUdp6 (
   IN UDP_IO                 *UdpIo,
   IN VOID                   *Context
@@ -573,6 +575,7 @@ IkeNegotiate (
     
 **/
 VOID
+EFIAPI
 IkeDispatch (
   IN NET_BUF                        *Packet,
   IN UDP_END_POINT                  *EndPoint,
diff --git a/NetworkPkg/IpSecDxe/IkeService.h b/NetworkPkg/IpSecDxe/IkeService.h
index cbd58cc080..232ecf3d96 100644
--- a/NetworkPkg/IpSecDxe/IkeService.h
+++ b/NetworkPkg/IpSecDxe/IkeService.h
@@ -207,6 +207,7 @@ IkeNegotiate (
     
 **/
 VOID
+EFIAPI
 IkeDispatch (
   IN NET_BUF                        *Packet,
   IN UDP_END_POINT                  *EndPoint,
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
index 35bebf7e43..0b83617389 100644
--- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
@@ -3015,6 +3015,7 @@ Ikev2OnPacketAccepted (
 
 **/
 VOID
+EFIAPI
 Ikev2OnPacketSent (
   IN NET_BUF                   *Packet,
   IN UDP_END_POINT             *EndPoint,
@@ -3050,7 +3051,7 @@ Ikev2OnPacketSent (
       IkePacketFree (IkePacket);
       return;
     }
-
+
     Private = IkePacket->Private;
     if (IkePacket->Spi != 0 ) {
       //
@@ -3088,7 +3089,7 @@ Ikev2OnPacketSent (
         IkeSaSession->InitiatorCookie,
         IkeSaSession->ResponderCookie)
         );
-
+
       RemoveEntryList (&IkeSaSession->BySessionTable);
       Ikev2SaSessionFree (IkeSaSession);
     }
@@ -3100,27 +3101,27 @@ Ikev2OnPacketSent (
   // should be changed.
   //
   if (Private != NULL && Private->IsIPsecDisabling) {
-    //
-    // After all IKE SAs were deleted, set the IPSEC_STATUS_DISABLED value in
-    // IPsec status variable.
-    //
+    //
+    // After all IKE SAs were deleted, set the IPSEC_STATUS_DISABLED value in
+    // IPsec status variable.
+    //
     if (IsListEmpty (&Private->Ikev1EstablishedList) && IsListEmpty (&Private->Ikev2EstablishedList)) {
-      Value = IPSEC_STATUS_DISABLED;
-      Status = gRT->SetVariable (
-                 IPSECCONFIG_STATUS_NAME,
-                 &gEfiIpSecConfigProtocolGuid,
-                 EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                 sizeof (Value),
-                 &Value
-                 );
-      if (!EFI_ERROR (Status)) {
-        //
-        // Set the DisabledFlag in Private data.
-        //
-        Private->IpSec.DisabledFlag = TRUE;
-        Private->IsIPsecDisabling   = FALSE;
-      }
-    }
+      Value = IPSEC_STATUS_DISABLED;
+      Status = gRT->SetVariable (
+                 IPSECCONFIG_STATUS_NAME,
+                 &gEfiIpSecConfigProtocolGuid,
+                 EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
+                 sizeof (Value),
+                 &Value
+                 );
+      if (!EFI_ERROR (Status)) {
+        //
+        // Set the DisabledFlag in Private data.
+        //
+        Private->IpSec.DisabledFlag = TRUE;
+        Private->IsIPsecDisabling   = FALSE;
+      }
+    }
   }
 }