Fixed passing ip_input() to netif_add() for single-IP-version NO_SYS configurations

This commit is contained in:
sg
2015-09-16 22:09:54 +02:00
parent b85b554db1
commit 68a1ec2eb1
3 changed files with 20 additions and 7 deletions

View File

@@ -267,7 +267,6 @@ extern struct ip_globals ip_data;
ip6_2_ip(ip6_netif_get_local_ip(netif, ip_2_ip6(dest)), storage) : \
ip4_2_ip(ip4_netif_get_local_ip(netif), storage))
#define ip_debug_print(is_ipv6, p) ((is_ipv6) ? ip6_debug_print(p) : ip4_debug_print(p))
err_t ip_input(struct pbuf *p, struct netif *inp);
#elif LWIP_IPV4 /* LWIP_IPV4 && LWIP_IPV6 */
#define ip_output(isipv6, p, src, dest, ttl, tos, proto) \
ip4_output(p, src, dest, ttl, tos, proto)
@@ -282,7 +281,6 @@ err_t ip_input(struct pbuf *p, struct netif *inp);
#define ip_netif_get_local_ip(isipv6, netif, dest, storage) \
ip4_netif_get_local_ip(netif)
#define ip_debug_print(is_ipv6, p) ip4_debug_print(p)
#define ip_input(p, inp) ip4_input(p, inp)
#elif LWIP_IPV6 /* LWIP_IPV4 && LWIP_IPV6 */
#define ip_output(isipv6, p, src, dest, ttl, tos, proto) \
ip6_output(p, src, dest, ttl, tos, proto)
@@ -297,7 +295,6 @@ err_t ip_input(struct pbuf *p, struct netif *inp);
#define ip_netif_get_local_ip(isipv6, netif, dest, storage) \
ip6_netif_get_local_ip(netif, dest)
#define ip_debug_print(is_ipv6, p) ip6_debug_print(p)
#define ip_input(p, inp) ip6_input(p, inp)
#endif /* LWIP_IPV6 */
#define ip_route_get_local_ip(isipv6, src, dest, netif, ipaddr, storage) do { \
@@ -305,6 +302,8 @@ err_t ip_input(struct pbuf *p, struct netif *inp);
(ipaddr) = ip_netif_get_local_ip(isipv6, netif, dest, storage); \
}while(0)
err_t ip_input(struct pbuf *p, struct netif *inp);
#ifdef __cplusplus
}
#endif