diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-06 07:51:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-06 07:51:44 -0500 |
| commit | d332cd59f7f1666e492eccdfdb0263c9cd85fc93 (patch) | |
| tree | 5267d25ac960f4a0831a0730b90b4653f5878580 /net/bootp.c | |
| parent | 898bd53e6a930080cee7cd7b1a09120c4dfd9467 (diff) | |
| parent | 53def68df5ec10c9aaa46d3422c58fc85d0c93e6 (diff) | |
Merge tag 'efi-2023-01-rc1-4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-01-rc1-4
Documentation:
* Provide a document about security issue handling.
UEFI:
* Let networking support depend on NETDEVICES.
* Discover if no efi_system_partition is set.
Other:
* MAINTAINERS: add arch/arm/lib/*_efi.* to EFI_PAYLOAD.
Diffstat (limited to 'net/bootp.c')
| -rw-r--r-- | net/bootp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c index b260d5d09e6..6c01e381532 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -1077,7 +1077,9 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, strlen(CONFIG_SYS_BOOTFILE_PREFIX)) == 0) { #endif /* CONFIG_SYS_BOOTFILE_PREFIX */ dhcp_packet_process_options(bp); - efi_net_set_dhcp_ack(pkt, len); + if (CONFIG_IS_ENABLED(EFI_LOADER) && + CONFIG_IS_ENABLED(NET_DEVICES)) + efi_net_set_dhcp_ack(pkt, len); #if defined(CONFIG_SERVERIP_FROM_PROXYDHCP) if (!net_server_ip.s_addr) |