X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=NetworkPkg%2FUefiPxeBcDxe%2FPxeBcBoot.c;h=46a13c5b1fd7396b1d7c28b6af3821bcbbd961db;hp=1f8895fdaa68480046a972169a78084004603eb0;hb=f75a7f568e6d0944327970b3f3f2dafd9bba76b1;hpb=9095d37b8fe5bfc3d02adad6ba7fd7359ebc0107 diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c b/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c index 1f8895fdaa..46a13c5b1f 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c @@ -1,7 +1,7 @@ /** @file Boot functions implementation for UefiPxeBc Driver. - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
This program and the accompanying materials @@ -102,14 +102,14 @@ PxeBcSelectBootPrompt ( // // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options, // we must not consider a boot prompt or boot menu if all of the following hold: - // - the PXE_DISCOVERY_CONTROL tag(6) is present inside the Vendor Options(43), and has bit 3 set + // - the PXE_DISCOVERY_CONTROL tag(6) is present inside the Vendor Options(43), and has bit 3 set // - a boot file name has been presented in the initial DHCP or ProxyDHCP offer packet. // if (IS_DISABLE_PROMPT_MENU (VendorOpt->DiscoverCtrl) && Cache->Dhcp4.OptList[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) { return EFI_ABORTED; } - + if (!IS_VALID_BOOT_PROMPT (VendorOpt->BitMap)) { return EFI_TIMEOUT; } @@ -471,7 +471,7 @@ PxeBcDhcp4BootInfo ( UINT16 Value; PXEBC_VENDOR_OPTION *VendorOpt; PXEBC_BOOT_SVR_ENTRY *Entry; - + PxeBc = &Private->PxeBc; Mode = PxeBc->Mode; Status = EFI_SUCCESS; @@ -789,8 +789,8 @@ PxeBcExtractDiscoverInfo ( if (Info->IpCnt >= 1) { *DiscoverInfo = AllocatePool (sizeof (*Info) + (Info->IpCnt - 1) * sizeof (**SrvList)); if (*DiscoverInfo == NULL) { - return EFI_OUT_OF_RESOURCES; - } + return EFI_OUT_OF_RESOURCES; + } CopyMem (*DiscoverInfo, Info, sizeof (*Info)); Info = *DiscoverInfo; } @@ -951,7 +951,7 @@ PxeBcDiscoverBootFile ( &Mode->ProxyOffer.Dhcpv4, &Mode->PxeReply.Dhcpv4, Private->PxeReply.Dhcp4.Packet.Ack.Length - ); + ); } Mode->ProxyOfferReceived = TRUE; }