Merge pull request #10361 from miri64/lwip/enh/bump-2.1.1

lwip: bump to version v2.1.2
This commit is contained in:
Gaëtan Harter
2018-11-30 18:57:47 +01:00
committed by GitHub
2 changed files with 2 additions and 40 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
PKG_NAME=lwip
PKG_URL=git://git.savannah.nongnu.org/lwip.git
# lwIP v2.1.0
PKG_VERSION=e6a8415df332ee34d7af02255b2aa1e8ee74348f
# lwIP v2.1.2
PKG_VERSION=159e31b689577dbf69cf0683bbaffbd71fa5ee10
PKG_LICENSE=BSD-3-Clause
LWIP_MODULES = lwip_api lwip_core lwip_ipv4 lwip_ipv6 \
@@ -1,38 +0,0 @@
From ae1128a138dbf7b14886853bd149757b03859cdb Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Thu, 27 Sep 2018 21:21:18 +0200
Subject: [PATCH] lowpan6.c: Fix IEEE 802.15.4 address setting
Reverts a regression introduced in
3a8af612b3b818a89de5846cc9b046756af184cc:
Use hardware address fetched from neighbor cache *not* the hardware
address of the interface as destination address.
---
src/netif/lowpan6.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/netif/lowpan6.c b/src/netif/lowpan6.c
index 5769522..7f0d276 100644
--- a/src/netif/lowpan6.c
+++ b/src/netif/lowpan6.c
@@ -630,11 +630,11 @@ lowpan6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr)
}
/* Send out the packet using the returned hardware address. */
- result = lowpan6_hwaddr_to_addr(netif, &dest);
- if (result != ERR_OK) {
- MIB2_STATS_NETIF_INC(netif, ifoutdiscards);
- return result;
- }
+ dest.addr_len = netif->hwaddr_len;
+ /* XXX: Inferring the length of the source address from the destination address
+ * is not correct for IEEE 802.15.4, but currently we don't get this information
+ * from the neighbor cache */
+ SMEMCPY(dest.addr, hwaddr, netif->hwaddr_len);
MIB2_STATS_NETIF_INC(netif, ifoutucastpkts);
return lowpan6_frag(netif, q, &src, &dest);
}
--
2.7.4