[riot-notifications] [RIOT-OS/RIOT] lwip: remove patches (#8644)

Gaëtan Harter notifications at github.com
Tue Feb 27 21:06:06 CET 2018


cladmi commented on this pull request.

I agree for the new Makefile format and implementation. I just have some remarks on the other file changes.

> -             MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
--            ip6_addr_set(&(neighbor_cache[i].next_hop_address), &tmp);
-+            ip6_addr_copy(neighbor_cache[i].next_hop_address, tmp);
- 
-             /* Receiving a message does not prove reachability: only in one direction.
-              * Delay probe in case we get confirmation of reachability from upper layer (TCP). */
-diff --git a/src/core/netif.c b/src/core/netif.c
-index 428b148..f7c18e9 100644
---- a/src/core/netif.c
-+++ b/src/core/netif.c
-@@ -1042,7 +1042,7 @@ netif_ip6_addr_set_parts(struct netif *netif, s8_t addr_idx, u32_t i0, u32_t i1,
-     LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_ip6_addr_set: netif address being changed\n"));
- 
-     if (netif_ip6_addr_state(netif, addr_idx) & IP6_ADDR_VALID) {
--#if LWIP_TCP || LWIP_UDP
-+#if LWIP_TCP || LWIP_UDP || LWIP_RAW

This is removing a condition that was there before I do not know if necessary or not. I would a least add a message in the commit if it was indeed not required.

> -Subject: [PATCH 1/2] Fix warnings
-
----
- src/core/ipv6/nd6.c | 2 +-
- src/core/netif.c    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/ipv6/nd6.c b/src/core/ipv6/nd6.c
-index 0b36718..b63a9b5 100644
---- a/src/core/ipv6/nd6.c
-+++ b/src/core/ipv6/nd6.c
-@@ -635,7 +635,7 @@ nd6_input(struct pbuf *p, struct netif *inp)
-           if (i >= 0) {
-             neighbor_cache[i].netif = inp;
-             MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
--            ip6_addr_set(&(neighbor_cache[i].next_hop_address), &tmp);

I now get warnings with `ip6_addr_set` but it should be safe to ignore for this in `makefiles/lwip_ipv6.mk` as it is not NULL.

```
/home/harter/work/git/RIOT/tests/lwip/bin/pkg/native/lwip/src/include/lwip/ip6_addr.h:100:60: error: the comparison will always evaluate as ‘false’ for the address of ‘tmp’ will never be NULL [-Werror=address]
 #define ip6_addr_set(dest, src) do{(dest)->addr[0] = (src) == NULL ? 0 : (src)->addr[0]; \
                                                            ^
/home/harter/work/git/RIOT/tests/lwip/bin/pkg/native/lwip/src/core/ipv6/nd6.c:638:13: note: in expansion of macro ‘ip6_addr_set’
             ip6_addr_set(&(neighbor_cache[i].next_hop_address), &tmp);
```

>  
-all: git-download
-	"$(MAKE)" -C $(PKG_BUILDDIR)
+.PHONY: all $(LWIP_SUBMODULES)
+
+all: git-download $(LWIP_USEMODULE)
+	"$(MAKE)" -f $(CURDIR)/makefiles/Makefile.lwip $ -C $(PKG_BUILDDIR)

I think this `$` in the middle is a copy paste leftover.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/RIOT-OS/RIOT/pull/8644#pullrequestreview-99833139
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.riot-os.org/pipermail/notifications/attachments/20180227/9b071b04/attachment-0001.html>


More information about the notifications mailing list