1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 17:52:47 +01:00

Merge pull request #5404 from miri64/pkg/enh/lwip-mld

lwip: introduce MLD as pseudo-module and deactivate by default
This commit is contained in:
Peter Kietzmann 2016-06-01 00:59:02 +02:00
commit 8cf11d3206
4 changed files with 9 additions and 1 deletions

View File

@ -365,7 +365,7 @@ ifneq (,$(filter lwip_sixlowpan,$(USEMODULE)))
USEMODULE += lwip_ipv6_autoconfig USEMODULE += lwip_ipv6_autoconfig
endif endif
ifneq (,$(filter lwip_ipv6_autoconfig,$(USEMODULE))) ifneq (,$(filter lwip_ipv6_autoconfig lwip_ipv6_mld,$(USEMODULE)))
USEMODULE += lwip_ipv6 USEMODULE += lwip_ipv6
endif endif

View File

@ -25,6 +25,7 @@ PSEUDOMODULES += lwip_dhcp
PSEUDOMODULES += lwip_ethernet PSEUDOMODULES += lwip_ethernet
PSEUDOMODULES += lwip_igmp PSEUDOMODULES += lwip_igmp
PSEUDOMODULES += lwip_ipv6_autoconfig PSEUDOMODULES += lwip_ipv6_autoconfig
PSEUDOMODULES += lwip_ipv6_mld
PSEUDOMODULES += lwip_raw PSEUDOMODULES += lwip_raw
PSEUDOMODULES += lwip_sixlowpan PSEUDOMODULES += lwip_sixlowpan
PSEUDOMODULES += lwip_stats PSEUDOMODULES += lwip_stats

View File

@ -74,6 +74,12 @@ extern "C" {
#define LWIP_IPV6_AUTOCONFIG (0) #define LWIP_IPV6_AUTOCONFIG (0)
#endif /* MODULE_LWIP_IPV6_AUTOCONFIG */ #endif /* MODULE_LWIP_IPV6_AUTOCONFIG */
#ifdef MODULE_LWIP_IPV6_MLD
#define LWIP_IPV6_MLD (1)
#else /* MODULE_LWIP_IPV6 */
#define LWIP_IPV6_MLD (0)
#endif /* MODULE_LWIP_IPV6 */
#ifdef MODULE_LWIP_IPV6 #ifdef MODULE_LWIP_IPV6
#define LWIP_IPV6 (1) #define LWIP_IPV6 (1)
#else /* MODULE_LWIP_IPV6 */ #else /* MODULE_LWIP_IPV6 */

View File

@ -9,6 +9,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-mega2560 msb-430h nrf6310 \
nucleo-f334 pca10005 stm32f0discovery weio \ nucleo-f334 pca10005 stm32f0discovery weio \
yunjia-nrf51822 z1 yunjia-nrf51822 z1
# including lwip_ipv6_mld would currently break this test on at86rf2xx radios
USEMODULE += lwip lwip_ipv6_autoconfig lwip_conn_ip lwip_netdev2 USEMODULE += lwip lwip_ipv6_autoconfig lwip_conn_ip lwip_netdev2
USEMODULE += lwip_udp lwip_conn_udp USEMODULE += lwip_udp lwip_conn_udp
USEMODULE += ipv6_addr USEMODULE += ipv6_addr