From: sfu5 Date: Tue, 14 May 2013 06:25:39 +0000 (+0000) Subject: Add Copyright notices and comments for Red Hat contributor. X-Git-Tag: edk2-stable201903~12544 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e3cf3c204884ec970fba9983f00b461d2a8be248 Add Copyright notices and comments for Red Hat contributor. Signed-off-by: Laszlo Ersek Reviewed-by: Fu Siyuan git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14355 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c index 6bca31967c..8be753151c 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c @@ -1,7 +1,8 @@ /** @file Support for PxeBc dhcp functions. -Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2013, Red Hat, Inc. +Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -1537,10 +1538,13 @@ PxeBcSelectBootPrompt ( VendorOpt = &Packet->PxeVendorOption; // - // 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 - // - a boot file name has been presented in the initial DHCP or ProxyDHCP offer packet. + // According to the PXE specification 2.1, Table 2-1 PXE DHCP Options (Full + // List), we must not consider a boot prompt or boot menu if all of the + // following hold: + // - the PXE_DISCOVERY_CONTROL PXE tag is present inside the Vendor Options + // (=43) DHCP tag, and + // - the PXE_DISCOVERY_CONTROL PXE tag has bit 3 set, and + // - a boot file name has been presented with DHCP option 67. // if (IS_DISABLE_PROMPT_MENU (VendorOpt->DiscoverCtrl) && Packet->Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] != NULL) { diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h index 9045251f59..b56d10d82a 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h @@ -1,7 +1,8 @@ /** @file Dhcp and Discover routines for PxeBc. -Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2013, Red Hat, Inc. +Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at