From 77b5c4a5b1dcc6dafde116bfdd66f769769a0aeb Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 14 Oct 2022 18:10:06 +0200 Subject: efi_loader: Let networking support depend on NETDEVICES CONFIG_NET does not imply that there are actually network devices available, only CONFIG_NETDEVICES does. Changing to this dependency obsoletes the check in Kconfig because NETDEVICES means DM_ETH. Fixes: 0efe1bcf5c2c ("efi_loader: Add network access support") Suggested-by: Tom Rini Signed-off-by: Jan Kiszka Reviewed-by: Heinrich Schuchardt --- net/bootp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'net') diff --git a/net/bootp.c b/net/bootp.c index b260d5d09e..6c01e38153 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) -- cgit v1.2.3