
8 changed files with 46 additions and 44 deletions
@ -1,29 +1,39 @@
|
||||
From 0e28e1cd26c1de2ccf48bea9013676ef1d4d69b7 Mon Sep 17 00:00:00 2001
|
||||
From f732fca2cd91553aa6f14ed851f84572d374aaa6 Mon Sep 17 00:00:00 2001
|
||||
From: Martine Lenders <mail@martine-lenders.eu>
|
||||
Date: Thu, 12 Nov 2015 16:36:00 +0100
|
||||
Subject: [PATCH 1/2] Fix warnings
|
||||
|
||||
---
|
||||
src/include/lwip/debug.h | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
src/core/ipv6/nd6.c | 2 +-
|
||||
src/core/netif.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/include/lwip/debug.h b/src/include/lwip/debug.h
|
||||
index 973a633..c7b3c9c 100644
|
||||
--- a/src/include/lwip/debug.h
|
||||
+++ b/src/include/lwip/debug.h
|
||||
@@ -67,8 +67,10 @@
|
||||
* -- To disable assertions define LWIP_NOASSERT in arch/cc.h.
|
||||
*/
|
||||
#ifndef LWIP_NOASSERT
|
||||
-#define LWIP_ASSERT(message, assertion) do { if(!(assertion)) \
|
||||
- LWIP_PLATFORM_ASSERT(message); } while(0)
|
||||
+#define LWIP_ASSERT(message, assertion) \
|
||||
+ if(!(assertion)) { \
|
||||
+ LWIP_PLATFORM_ASSERT(message); \
|
||||
+ }
|
||||
#ifndef LWIP_PLATFORM_ASSERT
|
||||
#error "If you want to use LWIP_ASSERT, LWIP_PLATFORM_ASSERT(message) needs to be defined in your arch/cc.h"
|
||||
#endif
|
||||
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);
|
||||
+ 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
|
||||
ip_addr_t new_ipaddr;
|
||||
IP_ADDR6(&new_ipaddr, i0, i1, i2, i3);
|
||||
#endif /* LWIP_TCP || LWIP_UDP */
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
Loading…
Reference in new issue