mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-03-12 13:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate TCPIP_MSG_INPKT_PPPOS message type.

Browse Source 
Fix my last commit, I accidentally unchecked the wrong file in commit dialog
This commit is contained in:
Dirk Ziegelmeier 2016-02-22 17:47:01 +01:00
parent 439ae629e0
commit fa6f068fd1
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/api/tcpip.c
View File

@ -111,21 +111,10 @@ tcpip_thread(void *arg)
#if !LWIP_TCPIP_CORE_LOCKING_INPUT #if !LWIP_TCPIP_CORE_LOCKING_INPUT
case TCPIP_MSG_INPKT: case TCPIP_MSG_INPKT:
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg)); LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg));
#if LWIP_ETHERNET msg->msg.inp.input_fn(msg->msg.inp.p, msg->msg.inp.netif);
if (msg->msg.inp.netif->flags & (NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET)) {
ethernet_input(msg->msg.inp.p, msg->msg.inp.netif);
} else
#endif /* LWIP_ETHERNET */
ip_input(msg->msg.inp.p, msg->msg.inp.netif);
memp_free(MEMP_TCPIP_MSG_INPKT, msg); memp_free(MEMP_TCPIP_MSG_INPKT, msg);
break; break;
#if PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE
case TCPIP_MSG_INPKT_PPPOS:
pppos_input_sys(msg->msg.inp.p, msg->msg.inp.netif);
memp_free(MEMP_TCPIP_MSG_INPKT, msg);
break;
#endif /* PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE */
#endif /* LWIP_TCPIP_CORE_LOCKING_INPUT */ #endif /* LWIP_TCPIP_CORE_LOCKING_INPUT */
#if LWIP_NETIF_API #if LWIP_NETIF_API
@ -211,6 +200,12 @@ tcpip_input(struct pbuf *p, struct netif *inp)
msg->type = TCPIP_MSG_INPKT; msg->type = TCPIP_MSG_INPKT;
msg->msg.inp.p = p; msg->msg.inp.p = p;
msg->msg.inp.netif = inp; msg->msg.inp.netif = inp;
#if LWIP_ETHERNET
if (inp->flags & (NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET)) {
msg->msg.inp.input_fn = ethernet_input;
} else
#endif /* LWIP_ETHERNET */
msg->msg.inp.input_fn = ip_input;
if (sys_mbox_trypost(&mbox, msg) != ERR_OK) { if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
memp_free(MEMP_TCPIP_MSG_INPKT, msg); memp_free(MEMP_TCPIP_MSG_INPKT, msg);
return ERR_MEM; return ERR_MEM;
@ -249,9 +244,10 @@ tcpip_pppos_input(struct pbuf *p, struct netif *inp)
return ERR_MEM; return ERR_MEM;
} }
msg->type = TCPIP_MSG_INPKT_PPPOS; msg->type = TCPIP_MSG_INPKT;
msg->msg.inp.p = p; msg->msg.inp.p = p;
msg->msg.inp.netif = inp; msg->msg.inp.netif = inp;
msg->msg.inp.input_fn = pppos_input_sys;
if (sys_mbox_trypost(&mbox, msg) != ERR_OK) { if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
memp_free(MEMP_TCPIP_MSG_INPKT, msg); memp_free(MEMP_TCPIP_MSG_INPKT, msg);
return ERR_MEM; return ERR_MEM;

3
src/include/lwip/priv/tcpip_priv.h
View File

@ -167,9 +167,6 @@ enum tcpip_msg_type {
TCPIP_MSG_API, TCPIP_MSG_API,
#endif /* LWIP_NETCONN || LWIP_SOCKET */ #endif /* LWIP_NETCONN || LWIP_SOCKET */
TCPIP_MSG_INPKT, TCPIP_MSG_INPKT,
#if PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE
TCPIP_MSG_INPKT_PPPOS,
#endif /* PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE */
#if LWIP_NETIF_API #if LWIP_NETIF_API
TCPIP_MSG_NETIFAPI, TCPIP_MSG_NETIFAPI,
#endif /* LWIP_NETIF_API */ #endif /* LWIP_NETIF_API */