1. Enable Network stack to pass SCT, currently MNP, ARP, IP4, TCP4 and DHCP4 have...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / PxeBcDxe / Bc.c

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
index 5f15c81e487b5c080a6f6e2a0098309c0712fbd2..a520349135f1e4bda998adb86ef3d3b330976e81 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
@@ -291,8 +291,12 @@ IpChecksum2 (
   )\r
 {\r
   UINT32  Sum;\r
+  UINT16  HeaderChecksum;\r
+  UINT16  MessageChecksum;\r
 \r
-  Sum = (UINT16)~IpChecksum (Header, HeaderLen) + (UINT16)~IpChecksum (Message, MessageLen);\r
+  HeaderChecksum = (UINT16)~IpChecksum (Header, HeaderLen);\r
+  MessageChecksum = (UINT16)~IpChecksum (Message, MessageLen);\r
+  Sum = HeaderChecksum + MessageChecksum;\r
 \r
   //\r
   // in case above carried\r
@@ -1350,7 +1354,7 @@ BcStart (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   BUFFER_ALLOCATE_SIZE,\r
-                  &Private->TransmitBufferPtr\r
+                  (VOID **) &Private->TransmitBufferPtr\r
                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
@@ -1364,7 +1368,7 @@ BcStart (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   BUFFER_ALLOCATE_SIZE,\r
-                  &Private->ReceiveBufferPtr\r
+                  (VOID **) &Private->ReceiveBufferPtr\r
                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
@@ -1379,7 +1383,7 @@ BcStart (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   256,\r
-                  &Private->TftpErrorBuffer\r
+                  (VOID **) &Private->TftpErrorBuffer\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -1389,7 +1393,7 @@ BcStart (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->AllocatePool (EfiBootServicesData, 256, &Private->TftpAckBuffer);\r
+  Status = gBS->AllocatePool (EfiBootServicesData, 256, (VOID **) &Private->TftpAckBuffer);\r
 \r
   if (EFI_ERROR (Status)) {\r
     gBS->FreePool (Private->TftpErrorBuffer);\r
@@ -1473,7 +1477,6 @@ BcStop (
   //\r
   // Lock the instance data\r
   //\r
-  EFI_PXE_BASE_CODE_MODE      *PxebcMode;\r
   EFI_SIMPLE_NETWORK_PROTOCOL *SnpPtr;\r
   EFI_SIMPLE_NETWORK_MODE     *SnpModePtr;\r
   EFI_STATUS                  StatCode;\r
@@ -1495,7 +1498,6 @@ BcStop (
 \r
   EfiAcquireLock (&Private->Lock);\r
 \r
-  PxebcMode   = Private->EfiBc.Mode;\r
   SnpPtr      = Private->SimpleNetwork;\r
   SnpModePtr  = SnpPtr->Mode;\r
 \r
@@ -1875,7 +1877,7 @@ BcSetParameters (
 \r
   if (SendGuidPtr != NULL) {\r
     if (*SendGuidPtr) {\r
-      if (PxeBcLibGetSmbiosSystemGuidAndSerialNumber (&TmpGuid, &SerialNumberPtr) != EFI_SUCCESS) {\r
+      if (PxeBcLibGetSmbiosSystemGuidAndSerialNumber (&TmpGuid, (CHAR8 **) &SerialNumberPtr) != EFI_SUCCESS) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r
@@ -2395,7 +2397,7 @@ InitializeBCDriver (
   InitArpHeader ();\r
   OptionsStrucInit ();\r
 \r
-  return EFI_SUCCESS;\r
+  return Status;\r
 }\r
 \r
 /* eof - bc.c */\r