diff options
| author | Tom Rini <[email protected]> | 2024-12-25 22:31:04 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-12-25 22:31:04 -0600 |
| commit | 5cfbf8c3644cc95c3c8b5d2541ed7f32136c0da1 (patch) | |
| tree | 3acd513189d5a8ba449a6e213a57c53f3fb2cdfb /net | |
| parent | 2c366eb1cd7ecad7b1d955b54219ba1447e2a47d (diff) | |
| parent | 3391587e3fe22db6c71882f652e13543a4501694 (diff) | |
Merge tag 'v2025.01-rc5' into next
Prepare v2025.01-rc5
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 2 | ||||
| -rw-r--r-- | net/lwip/dhcp.c | 10 | ||||
| -rw-r--r-- | net/lwip/dns.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/net/Kconfig b/net/Kconfig index b4bb68dd613..24508026200 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -90,7 +90,7 @@ config TFTP_WINDOWSIZE config TFTP_TSIZE bool "Track TFTP transfers based on file size option" depends on CMD_TFTPBOOT - default y if (ARCH_OMAP2PLUS || ARCH_K3) + default y if (ARCH_OMAP2PLUS || ARCH_K3 || ARCH_RENESAS) help By default, TFTP progress bar is increased for each received UDP frame, which can lead into long time being spent for sending diff --git a/net/lwip/dhcp.c b/net/lwip/dhcp.c index 9b882cf5b87..e7d9147455c 100644 --- a/net/lwip/dhcp.c +++ b/net/lwip/dhcp.c @@ -3,6 +3,7 @@ #include <command.h> #include <console.h> +#include <log.h> #include <dm/device.h> #include <linux/delay.h> #include <linux/errno.h> @@ -112,10 +113,17 @@ static int dhcp_loop(struct udevice *udev) int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { int ret; + struct udevice *dev; eth_set_current(); - ret = dhcp_loop(eth_get_dev()); + dev = eth_get_dev(); + if (!dev) { + log_err("No network device\n"); + return CMD_RET_FAILURE; + } + + ret = dhcp_loop(dev); if (ret) return ret; diff --git a/net/lwip/dns.c b/net/lwip/dns.c index 4b937feaee1..1de63c9998b 100644 --- a/net/lwip/dns.c +++ b/net/lwip/dns.c @@ -56,7 +56,7 @@ static int dns_loop(struct udevice *udev, const char *name, const char *var) netif = net_lwip_new_netif(udev); if (!netif) - return -1; + return CMD_RET_FAILURE; dns_init(); |