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

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

Browse Source
This commit is contained in:
goldsimon 2012-02-23 07:58:59 +01:00
parent 3db3811054
commit 5deeaa652a
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,7 +313,7 @@
* The formula expects settings to be either '0' or '1'. * The formula expects settings to be either '0' or '1'.
*/ */
#ifndef MEMP_NUM_SYS_TIMEOUT #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 #endif
/** /**

3
src/netif/slipif.c
View File

@ -331,9 +331,6 @@ slipif_init(struct netif *netif)
netif->name[0] = 's'; netif->name[0] = 's';
netif->name[1] = 'l'; netif->name[1] = 'l';
netif->output = slipif_output; netif->output = slipif_output;
#if LWIP_IPV6
netif->output_ip6 = slipif_output;
#endif /* LWIP_IPV6 */
netif->mtu = SLIP_MAX_SIZE; netif->mtu = SLIP_MAX_SIZE;
netif->flags |= NETIF_FLAG_POINTTOPOINT; netif->flags |= NETIF_FLAG_POINTTOPOINT;

3
test/unit/tcp/tcp_helper.c
View File

@ -243,9 +243,6 @@ void test_tcp_input(struct pbuf *p, struct netif *inp)
current_netif = inp; current_netif = inp;
current_header = iphdr; 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); tcp_input(p, inp);
current_iphdr_dest.addr = 0; current_iphdr_dest.addr = 0;