From 5deeaa652af2c9b1a43da3fc6e57e62b7e6afbd4 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Thu, 23 Feb 2012 07:58:59 +0100 Subject: [PATCH] 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 --- src/include/lwip/opt.h | 2 +- src/netif/slipif.c | 3 --- test/unit/tcp/tcp_helper.c | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h index 08b6b552..b8ebec86 100644 --- a/src/include/lwip/opt.h +++ b/src/include/lwip/opt.h @@ -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 /** diff --git a/src/netif/slipif.c b/src/netif/slipif.c index c7daa3b3..27776309 100644 --- a/src/netif/slipif.c +++ b/src/netif/slipif.c @@ -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; diff --git a/test/unit/tcp/tcp_helper.c b/test/unit/tcp/tcp_helper.c index 98aca61c..dd550f1b 100644 --- a/test/unit/tcp/tcp_helper.c +++ b/test/unit/tcp/tcp_helper.c @@ -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;