diff options
| author | Tom Rini <[email protected]> | 2025-02-12 08:41:36 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-02-12 12:37:30 -0600 |
| commit | 9b35357b95e30fd670869b4348159b65e102cc82 (patch) | |
| tree | 2aee5b7566dc114ee0f02c4507c94885d1eb72d2 /include | |
| parent | 3da1864b1f2fc3cf2b4eaa1849bcafa669ff674c (diff) | |
| parent | a091d173e32b98fe372b5b02d4e25c81f1bc9dc1 (diff) | |
Merge branch 'u-boot-net-20250212' of https://source.denx.de/u-boot/custodians/u-boot-net
CI: https://source.denx.de/u-boot/custodians/u-boot-net/-/pipelines/24577
net-lwip:
* Fix incorrect selection of ethernet device on boards having more than
one
* Fix TFTP option processing
* Make the WGET_HTTPS Kconfig symbol depend on DM_RNG
lib:
* Add strnstr()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/string.h | 3 | ||||
| -rw-r--r-- | include/net-lwip.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 27b2beb9ddb..d943fcce690 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -72,6 +72,9 @@ extern char * strrchr(const char *,int); #ifndef __HAVE_ARCH_STRSTR extern char * strstr(const char *,const char *); #endif +#ifndef __HAVE_ARCH_STRNSTR +extern char *strnstr(const char *, const char *, size_t); +#endif #ifndef __HAVE_ARCH_STRLEN extern __kernel_size_t strlen(const char *); #endif diff --git a/include/net-lwip.h b/include/net-lwip.h index 4d7f9387d1d..64e5c720560 100644 --- a/include/net-lwip.h +++ b/include/net-lwip.h @@ -10,6 +10,7 @@ enum proto_t { TFTPGET }; +void net_lwip_set_current(void); struct netif *net_lwip_new_netif(struct udevice *udev); struct netif *net_lwip_new_netif_noip(struct udevice *udev); void net_lwip_remove_netif(struct netif *netif); |