diff --git a/pkg/lwip/Makefile b/pkg/lwip/Makefile index 5b464b6aeb81..213c95feb38e 100644 --- a/pkg/lwip/Makefile +++ b/pkg/lwip/Makefile @@ -1,7 +1,7 @@ PKG_NAME=lwip PKG_URL=https://github.com/lwip-tcpip/lwip.git -# lwIP v2.1.2 -PKG_VERSION=159e31b689577dbf69cf0683bbaffbd71fa5ee10 +# lwIP v2.1.3 +PKG_VERSION=6ca936f6b588cee702c638eee75c2436e6cf75de PKG_LICENSE=BSD-3-Clause include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/lwip/patches/0002-lowpan6-Use-arch-independent-printf-formatters.patch b/pkg/lwip/patches/0002-lowpan6-Use-arch-independent-printf-formatters.patch deleted file mode 100644 index 9ce4b3f6ff06..000000000000 --- a/pkg/lwip/patches/0002-lowpan6-Use-arch-independent-printf-formatters.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e02d126b07388c5ff49a6cd25cef14214157b52f Mon Sep 17 00:00:00 2001 -From: Erik Ekman -Date: Sat, 13 Feb 2021 21:14:29 +0100 -Subject: [PATCH] lowpan6: Use arch-independent printf formatters - ---- - src/netif/lowpan6_common.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/netif/lowpan6_common.c b/src/netif/lowpan6_common.c -index 6900eec7..01b62dfd 100644 ---- a/src/netif/lowpan6_common.c -+++ b/src/netif/lowpan6_common.c -@@ -440,7 +440,7 @@ lowpan6_decompress_hdr(u8_t *lowpan6_buffer, size_t lowpan6_bufsize, - if ((lowpan6_buffer[0] & 0x18) == 0x00) { - header_temp = ((lowpan6_buffer[lowpan6_offset+1] & 0x0f) << 16) | \ - (lowpan6_buffer[lowpan6_offset + 2] << 8) | lowpan6_buffer[lowpan6_offset+3]; -- LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("TF: 00, ECN: 0x%2x, Flowlabel+DSCP: 0x%8X\n", \ -+ LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("TF: 00, ECN: 0x%"X8_F", Flowlabel+DSCP: 0x%8"X32_F"\n", \ - lowpan6_buffer[lowpan6_offset],header_temp)); - IP6H_VTCFL_SET(ip6hdr, 6, lowpan6_buffer[lowpan6_offset], header_temp); - /* increase offset, processed 4 bytes here: -@@ -448,14 +448,14 @@ lowpan6_decompress_hdr(u8_t *lowpan6_buffer, size_t lowpan6_bufsize, - lowpan6_offset += 4; - } else if ((lowpan6_buffer[0] & 0x18) == 0x08) { - header_temp = ((lowpan6_buffer[lowpan6_offset] & 0x0f) << 16) | (lowpan6_buffer[lowpan6_offset + 1] << 8) | lowpan6_buffer[lowpan6_offset+2]; -- LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("TF: 01, ECN: 0x%2x, Flowlabel: 0x%2X, DSCP ignored\n", \ -+ LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("TF: 01, ECN: 0x%"X8_F", Flowlabel: 0x%2"X32_F", DSCP ignored\n", \ - lowpan6_buffer[lowpan6_offset] & 0xc0,header_temp)); - IP6H_VTCFL_SET(ip6hdr, 6, lowpan6_buffer[lowpan6_offset] & 0xc0, header_temp); - /* increase offset, processed 3 bytes here: - * TF=01: ECN + 2-bit Pad + Flow Label (3 bytes), DSCP is elided.*/ - lowpan6_offset += 3; - } else if ((lowpan6_buffer[0] & 0x18) == 0x10) { -- LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("TF: 10, DCSP+ECN: 0x%2x, Flowlabel ignored\n", lowpan6_buffer[lowpan6_offset])); -+ LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("TF: 10, DCSP+ECN: 0x%"X8_F", Flowlabel ignored\n", lowpan6_buffer[lowpan6_offset])); - IP6H_VTCFL_SET(ip6hdr, 6, lowpan6_buffer[lowpan6_offset],0); - /* increase offset, processed 1 byte here: - * ECN + DSCP (1 byte), Flow Label is elided.*/ -@@ -564,7 +564,7 @@ lowpan6_decompress_hdr(u8_t *lowpan6_buffer, size_t lowpan6_bufsize, - #if LWIP_6LOWPAN_NUM_CONTEXTS > 0 - ip6hdr->src.addr[0] = lowpan6_contexts[i].addr[0]; - ip6hdr->src.addr[1] = lowpan6_contexts[i].addr[1]; -- LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("SAM == xx, context compression found @%d: %8X, %8X\n", (int)i, ip6hdr->src.addr[0], ip6hdr->src.addr[1])); -+ LWIP_DEBUGF(LWIP_LOWPAN6_DECOMPRESSION_DEBUG, ("SAM == xx, context compression found @%d: %8"X32_F", %8"X32_F"\n", (int)i, ip6hdr->src.addr[0], ip6hdr->src.addr[1])); - #else - LWIP_UNUSED_ARG(lowpan6_contexts); - #endif --- -2.29.2 - diff --git a/pkg/lwip/patches/0003-netif_is_flag_set-fix.patch b/pkg/lwip/patches/0003-netif_is_flag_set-fix.patch deleted file mode 100644 index 66c0c01b94dd..000000000000 --- a/pkg/lwip/patches/0003-netif_is_flag_set-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -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);