Clean ISA_IO/ISA_IO_16 and VGA_IO/VGA_IO_16 attribute usage in PCI bus driver/PCI...

[mirror_edk2.git] / NetworkPkg / Application / IpsecConfig / PolicyEntryOperation.c

diff --git a/NetworkPkg/Application/IpsecConfig/PolicyEntryOperation.c b/NetworkPkg/Application/IpsecConfig/PolicyEntryOperation.c
index ddfbb4c5041dc1b9da454c7976a02c511fc2a666..f128bee1ec58100c5e571448bcd6bdebcf4e8281 100644 (file)
--- a/NetworkPkg/Application/IpsecConfig/PolicyEntryOperation.c
+++ b/NetworkPkg/Application/IpsecConfig/PolicyEntryOperation.c
@@ -932,7 +932,7 @@ CreateSadEntry (
             L"--auth-algo"\r
             );\r
           ReturnStatus = EFI_INVALID_PARAMETER;\r
-        } else if ((*Data)->AlgoInfo.EspAlgoInfo.AuthAlgoId != EFI_IPSEC_AALG_NONE && (*Mask & AUTH_KEY) == 0) {\r
+        } else if ((*Data)->AlgoInfo.EspAlgoInfo.AuthAlgoId != IPSEC_AALG_NONE && (*Mask & AUTH_KEY) == 0) {\r
           ShellPrintHiiEx (\r
             -1,\r
             -1,\r
@@ -956,7 +956,7 @@ CreateSadEntry (
             L"--encrypt-algo"\r
             );\r
           ReturnStatus = EFI_INVALID_PARAMETER;\r
-        } else if ((*Data)->AlgoInfo.EspAlgoInfo.EncAlgoId != EFI_IPSEC_EALG_NONE && (*Mask & ENCRYPT_KEY) == 0) {\r
+        } else if ((*Data)->AlgoInfo.EspAlgoInfo.EncAlgoId != IPSEC_EALG_NONE && (*Mask & ENCRYPT_KEY) == 0) {\r
           ShellPrintHiiEx (\r
             -1,\r
             -1,\r
@@ -999,7 +999,7 @@ CreatePadEntry (
 {\r
   EFI_STATUS         Status;\r
   EFI_STATUS         ReturnStatus;\r
-  EFI_FILE_HANDLE    FileHandle;\r
+  SHELL_FILE_HANDLE  FileHandle;\r
   UINT64             FileSize;\r
   UINTN              AuthDataLength;\r
   UINTN              RevocationDataLength;\r
@@ -1588,7 +1588,7 @@ CombineSadEntry (
     //\r
     // Encrypt_key should be provided if algorithm is not NONE.\r
     //\r
-    if (NewData->AlgoInfo.EspAlgoInfo.EncAlgoId != EFI_IPSEC_EALG_NONE && (Mask & ENCRYPT_KEY) == 0) {\r
+    if (NewData->AlgoInfo.EspAlgoInfo.EncAlgoId != IPSEC_EALG_NONE && (Mask & ENCRYPT_KEY) == 0) {\r
       ShellPrintHiiEx (\r
         -1,\r
         -1,\r