abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-22 16:16:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

tcpip.h, tcpip.c, ethernetif.c, opt.h: remove options ETHARP_TCPIP_INPUT & ETHARP_TCPIP_ETHINPUT, now, only "ethinput" code is supported, even if the name is tcpip_input (we keep the name of 1.2.0 function).

Browse Source
This commit is contained in:
fbernon
2007-08-22 10:04:35 +00:00
parent c4b97a1710
commit 42f3c24fc4
5 changed files with 32 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/include/lwip/opt.h
View File

@@ -316,27 +316,6 @@
#define ETHARP_TRUST_IP_MAC 1
#endif
/**
* ETHARP_TCPIP_INPUT==1: Driver can pass packets to tcpip_input after it
* has processed any incoming ARP packets. Incoming IP packets are then
* processed in tcpip_thread context. It is recommended that you use
* ETHARP_TCPIP_ETHINPUT instead; see that option for explanation.
* (only useful if you use tcpip.c)
*/
#ifndef ETHARP_TCPIP_INPUT
#define ETHARP_TCPIP_INPUT 1
#endif
/**
* ETHARP_TCPIP_ETHINPUT==1: Driver passes *all* packets to tcpip_ethinput
* (and not tcpip_input). IP and ARP packets will be both processed inside
* tcpip_thread context. The aim is to protect ARP layer against concurrent
* access. Older ports have to be updated to use tcpip_ethinput.
*/
#ifndef ETHARP_TCPIP_ETHINPUT
#define ETHARP_TCPIP_ETHINPUT 1
#endif
/**
* ETHARP_QUEUE_FIRST is deprecated
*/

16
src/include/lwip/tcpip.h
View File

@@ -64,14 +64,9 @@ err_t tcpip_apimsg(struct api_msg *apimsg);
err_t tcpip_apimsg_lock(struct api_msg *apimsg);
#endif /* LWIP_TCPIP_CORE_LOCKING */
#if ETHARP_TCPIP_INPUT
#if LWIP_ARP
err_t tcpip_input(struct pbuf *p, struct netif *inp);
err_t tcpip_input_callback(struct pbuf *p, struct netif *inp, err_t (*f)(struct pbuf *, struct netif *));
#endif /* ETHARP_TCPIP_INPUT */
#if ETHARP_TCPIP_ETHINPUT
err_t tcpip_ethinput(struct pbuf *p, struct netif *inp);
#endif /* ETHARP_TCPIP_ETHINPUT */
#endif /* LWIP_ARP */
#if LWIP_NETIF_API
err_t tcpip_netifapi(struct netifapi_msg *netifapimsg);
@@ -86,9 +81,9 @@ err_t tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg);
enum tcpip_msg_type {
TCPIP_MSG_API,
#if ETHARP_TCPIP_INPUT || ETHARP_TCPIP_ETHINPUT
#if LWIP_ARP
TCPIP_MSG_INPKT,
#endif /* ETHARP_TCPIP_INPUT || ETHARP_TCPIP_ETHINPUT */
#endif /* LWIP_ARP */
#if LWIP_NETIF_API
TCPIP_MSG_NETIFAPI,
#endif /* LWIP_NETIF_API */
@@ -104,11 +99,12 @@ struct tcpip_msg {
#if LWIP_NETIF_API
struct netifapi_msg *netifapimsg;
#endif /* LWIP_NETIF_API */
#if LWIP_ARP
struct {
struct pbuf *p;
struct netif *netif;
err_t (*f)(struct pbuf *, struct netif *);
} inp;
#endif /* LWIP_ARP */
struct {
void (*f)(void *ctx);
void *ctx;