提交 7b14c2de 编写于 作者: Huge_HW's avatar Huge_HW

fix compile problem

Signed-off-by: Huge_HW's avatarHuge_Dream <534463586@qq.com>
Change-Id: Id93f43ab6c330ca0ad87a8d168294ff1bb214b34
上级 d0bc4187
...@@ -49,6 +49,9 @@ ...@@ -49,6 +49,9 @@
#include "lwip/pbuf.h" #include "lwip/pbuf.h"
#include "lwip/etharp.h" #include "lwip/etharp.h"
#include "netif/ethernet.h" #include "netif/ethernet.h"
#if LWIP_LOWPOWER
#include "lwip/lowpower.h"
#endif
#define TCPIP_MSG_VAR_REF(name) API_VAR_REF(name) #define TCPIP_MSG_VAR_REF(name) API_VAR_REF(name)
#define TCPIP_MSG_VAR_DECLARE(name) API_VAR_DECLARE(struct tcpip_msg, name) #define TCPIP_MSG_VAR_DECLARE(name) API_VAR_DECLARE(struct tcpip_msg, name)
...@@ -242,11 +245,6 @@ tcpip_send_msg_na(enum lowpower_msg_type type) ...@@ -242,11 +245,6 @@ tcpip_send_msg_na(enum lowpower_msg_type type)
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_send_msg_na alloc faild\n")); LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_send_msg_na alloc faild\n"));
return; return;
} }
if (!sys_dual_mbox_valid(MBOXPTR)) {
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_send_msg_na mbox invalid\n"));
memp_free(MEMP_TCPIP_MSG_LOWPOWER, msg);
return;
}
/* just wake up thread if nonblock */ /* just wake up thread if nonblock */
msg->type = TCPIP_MSG_NA; msg->type = TCPIP_MSG_NA;
...@@ -261,7 +259,7 @@ tcpip_send_msg_na(enum lowpower_msg_type type) ...@@ -261,7 +259,7 @@ tcpip_send_msg_na(enum lowpower_msg_type type)
} }
} }
if (TCPIP_MBOX_TRYPOST(MBOXPTR, msg) != ERR_OK) { if (sys_mbox_trypost(&tcpip_mbox, msg) != ERR_OK) {
if (type == LOW_BLOCK) { if (type == LOW_BLOCK) {
LOWPOWER_SEM_FREE(msg->msg.lowpower.wait_up); LOWPOWER_SEM_FREE(msg->msg.lowpower.wait_up);
} }
......
...@@ -536,8 +536,6 @@ u32_t ...@@ -536,8 +536,6 @@ u32_t
mld6_tmr_tick(void) mld6_tmr_tick(void)
{ {
struct netif *netif = netif_list; struct netif *netif = netif_list;
struct mld6_listener *listener = NULL;
u32_t val = 0;
u32_t tick = 0; u32_t tick = 0;
while (netif != NULL) { while (netif != NULL) {
......
...@@ -1220,9 +1220,6 @@ nd6_tmr_tick(void) ...@@ -1220,9 +1220,6 @@ nd6_tmr_tick(void)
/* Process our own addresses, updating address lifetimes and/or DAD state. */ /* Process our own addresses, updating address lifetimes and/or DAD state. */
NETIF_FOREACH(netif) { NETIF_FOREACH(netif) {
if ((netif->flags & NETIF_FLAG_LOOPBACK) != 0) {
continue;
}
for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; ++i) { for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; ++i) {
u8_t addr_state; u8_t addr_state;
#if LWIP_IPV6_ADDRESS_LIFETIMES #if LWIP_IPV6_ADDRESS_LIFETIMES
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "lwip/sys.h" #include "lwip/sys.h"
#include "lwip/pbuf.h" #include "lwip/pbuf.h"
#include "netif/lowpan6.h" #include "netif/lowpan6.h"
#include "lwip/nat64.h"
#include "lwip/api.h" #include "lwip/api.h"
#if LWIP_LOWPOWER #if LWIP_LOWPOWER
...@@ -341,7 +340,7 @@ tcpip_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg) ...@@ -341,7 +340,7 @@ tcpip_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg)
again: again:
if (g_timer_header == NULL) { if (g_timer_header == NULL) {
UNLOCK_TCPIP_CORE(); UNLOCK_TCPIP_CORE();
(void)sys_arch_mbox_fetch_ext(mbox, msg, 0, 0); (void)sys_arch_mbox_fetch(mbox, msg, 0);
LOCK_TCPIP_CORE(); LOCK_TCPIP_CORE();
return; return;
} }
...@@ -353,7 +352,7 @@ again: ...@@ -353,7 +352,7 @@ again:
sys_timeout_set_wake_time(TIMEOUT_MAX); sys_timeout_set_wake_time(TIMEOUT_MAX);
UNLOCK_TCPIP_CORE(); UNLOCK_TCPIP_CORE();
ret = sys_arch_mbox_fetch_ext(mbox, msg, sleeptime, 0); ret = sys_arch_mbox_fetch(mbox, msg, sleeptime);
LOCK_TCPIP_CORE(); LOCK_TCPIP_CORE();
set_timer_state(LOW_TMR_TIMER_HANDLING, 0); set_timer_state(LOW_TMR_TIMER_HANDLING, 0);
now = sys_now(); now = sys_now();
......
...@@ -111,6 +111,9 @@ ...@@ -111,6 +111,9 @@
#include "lwip/ip6.h" #include "lwip/ip6.h"
#include "lwip/ip6_addr.h" #include "lwip/ip6_addr.h"
#include "lwip/nd6.h" #include "lwip/nd6.h"
#if LWIP_LOWPOWER
#include "lwip/priv/api_msg.h"
#endif
#include <string.h> #include <string.h>
...@@ -344,7 +347,7 @@ tcp_slow_tmr_tick(void) ...@@ -344,7 +347,7 @@ tcp_slow_tmr_tick(void)
pcb = tcp_active_pcbs; pcb = tcp_active_pcbs;
while (pcb != NULL) { while (pcb != NULL) {
if (((pcb->state == SYN_SENT) && (pcb->nrtx >= TCP_SYNMAXRTX)) || if (((pcb->state == SYN_SENT) && (pcb->nrtx >= TCP_SYNMAXRTX)) ||
(((pcb->state == FIN_WAIT_1) || (pcb->state == CLOSING)) && (pcb->nrtx >= TCP_FW1MAXRTX)) || ((pcb->state == FIN_WAIT_1) || (pcb->state == CLOSING)) ||
(pcb->nrtx >= TCP_MAXRTX)) { (pcb->nrtx >= TCP_MAXRTX)) {
return 1; return 1;
} }
...@@ -386,8 +389,7 @@ tcp_fast_tmr_tick(void) ...@@ -386,8 +389,7 @@ tcp_fast_tmr_tick(void)
/* send delayed ACKs or send pending FIN */ /* send delayed ACKs or send pending FIN */
if ((pcb->flags & TF_ACK_DELAY) || if ((pcb->flags & TF_ACK_DELAY) ||
(pcb->flags & TF_CLOSEPEND) || (pcb->flags & TF_CLOSEPEND) ||
(pcb->refused_data != NULL) || (pcb->refused_data != NULL)
(pcb->tcp_pcb_flag & TCP_PBUF_FLAG_TCP_FIN_RECV_SYSPOST_FAIL)
) { ) {
LOWPOWER_DEBUG(("%s:%d tmr tick: 1\n", __func__, __LINE__)); LOWPOWER_DEBUG(("%s:%d tmr tick: 1\n", __func__, __LINE__));
return 1; return 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册