From c7d24f791281f9d3249aeb41443d0e6f6db4b73c Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Tue, 13 Jul 2021 13:07:38 +0200 Subject: [PATCH 1/2] pkg/lwip: Add patch to fix netif_is_flag_set macro Had spelling mistake: `nefif` instead of `netif`. --- .../patches/0003-netif_is_flag_set-fix.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkg/lwip/patches/0003-netif_is_flag_set-fix.patch diff --git a/pkg/lwip/patches/0003-netif_is_flag_set-fix.patch b/pkg/lwip/patches/0003-netif_is_flag_set-fix.patch new file mode 100644 index 0000000000..66c0c01b94 --- /dev/null +++ b/pkg/lwip/patches/0003-netif_is_flag_set-fix.patch @@ -0,0 +1,22 @@ +From 7a2923020f3686b030d38c3e604b1f3801ca2e43 Mon Sep 17 00:00:00 2001 +From: Thomas Mueller +Date: Mon, 8 Feb 2021 19:17:20 +0100 +Subject: [PATCH] Fix typo in definition of netif_is_flag_set() macro + +--- + src/include/lwip/netif.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h +index 5ecf8cdc8..6e04ce84b 100644 +--- a/src/include/lwip/netif.h ++++ b/src/include/lwip/netif.h +@@ -469,7 +469,7 @@ void netif_set_gw(struct netif *netif, const ip4_addr_t *gw); + + #define netif_set_flags(netif, set_flags) do { (netif)->flags = (u8_t)((netif)->flags | (set_flags)); } while(0) + #define netif_clear_flags(netif, clr_flags) do { (netif)->flags = (u8_t)((netif)->flags & (u8_t)(~(clr_flags) & 0xff)); } while(0) +-#define netif_is_flag_set(nefif, flag) (((netif)->flags & (flag)) != 0) ++#define netif_is_flag_set(netif, flag) (((netif)->flags & (flag)) != 0) + + void netif_set_up(struct netif *netif); + void netif_set_down(struct netif *netif); From 4e019001088adadb774f1445473f1d9bba2d10f8 Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Tue, 13 Jul 2021 13:45:16 +0200 Subject: [PATCH 2/2] pkg/lwip: Start DHCP on correct interface Fix for #16229 --- pkg/lwip/contrib/lwip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/lwip/contrib/lwip.c b/pkg/lwip/contrib/lwip.c index 01bfcdf701..800e8d84d8 100644 --- a/pkg/lwip/contrib/lwip.c +++ b/pkg/lwip/contrib/lwip.c @@ -284,7 +284,7 @@ void lwip_bootstrap(void) struct netif *n = NULL; NETIF_FOREACH(n) { if (netif_is_flag_set(n, NETIF_FLAG_ETHERNET)) { - netifapi_dhcp_start(netif); + netifapi_dhcp_start(n); } } }