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

@@ -349,13 +349,14 @@ return_noroute:
}
#endif /* IP_FORWARD */
#if LWIP_IPV6
/* If both IP versions are enabled, this function can dispatch packets to the correct one.
* May be used as netif input function.
*/
* If only IPv4 is enabled, this directly maps at ip4_input.
* May be used as netif input function.
*/
err_t
ip_input(struct pbuf *p, struct netif *inp)
{
#if LWIP_IPV6
if (p != NULL) {
if (IP_HDR_GET_VERSION(p->payload) == 6) {
return ip6_input(p, inp);
@@ -363,8 +364,10 @@ ip_input(struct pbuf *p, struct netif *inp)
return ip4_input(p, inp);
}
return ERR_VAL;
#else /* LWIP_IPV6 */
return ip4_input(p, inp);
#endif /* LWIP_IPV6 */
}
#endif
/**
* This function is called by the network interface device driver when