mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2025-03-19 16:20:45 +00:00
Removed IPv6 code slipped in while cherry picking: MEMP_NUM_SYS_TIMEOUT default value must not depend on LWIP_IPV6, tcp unit tests failed, slipif assigned netif->output_ip6
This commit is contained in:
parent
3db3811054
commit
5deeaa652a
@ -313,7 +313,7 @@
|
||||
* The formula expects settings to be either '0' or '1'.
|
||||
*/
|
||||
#ifndef MEMP_NUM_SYS_TIMEOUT
|
||||
#define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD) : 0))
|
||||
#define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT)
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
@ -331,9 +331,6 @@ slipif_init(struct netif *netif)
|
||||
netif->name[0] = 's';
|
||||
netif->name[1] = 'l';
|
||||
netif->output = slipif_output;
|
||||
#if LWIP_IPV6
|
||||
netif->output_ip6 = slipif_output;
|
||||
#endif /* LWIP_IPV6 */
|
||||
netif->mtu = SLIP_MAX_SIZE;
|
||||
netif->flags |= NETIF_FLAG_POINTTOPOINT;
|
||||
|
||||
|
@ -243,9 +243,6 @@ void test_tcp_input(struct pbuf *p, struct netif *inp)
|
||||
current_netif = inp;
|
||||
current_header = iphdr;
|
||||
|
||||
/* since adding IPv6, p->payload must point to tcp header, not ip header */
|
||||
pbuf_header(p, -(s16_t)sizeof(struct ip_hdr));
|
||||
|
||||
tcp_input(p, inp);
|
||||
|
||||
current_iphdr_dest.addr = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user