From b605852638cd3f6b1d5ded270c080bf3ed3a5e3d Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Thu, 28 Apr 2016 12:22:42 +0200
Subject: [PATCH 1/2] lwip: introduce MLD as pseudo-module and deactivate by
 default

---
 Makefile.dep                | 2 +-
 Makefile.pseudomodules      | 1 +
 pkg/lwip/include/lwipopts.h | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile.dep b/Makefile.dep
index 218e5aaa83..a1a5e4d6fb 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -365,7 +365,7 @@ ifneq (,$(filter lwip_sixlowpan,$(USEMODULE)))
   USEMODULE += lwip_ipv6_autoconfig
 endif
 
-ifneq (,$(filter lwip_ipv6_autoconfig,$(USEMODULE)))
+ifneq (,$(filter lwip_ipv6_autoconfig lwip_ipv6_mld,$(USEMODULE)))
   USEMODULE += lwip_ipv6
 endif
 
diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules
index 2bc202a645..56f82598ff 100644
--- a/Makefile.pseudomodules
+++ b/Makefile.pseudomodules
@@ -25,6 +25,7 @@ PSEUDOMODULES += lwip_dhcp
 PSEUDOMODULES += lwip_ethernet
 PSEUDOMODULES += lwip_igmp
 PSEUDOMODULES += lwip_ipv6_autoconfig
+PSEUDOMODULES += lwip_ipv6_mld
 PSEUDOMODULES += lwip_raw
 PSEUDOMODULES += lwip_sixlowpan
 PSEUDOMODULES += lwip_stats
diff --git a/pkg/lwip/include/lwipopts.h b/pkg/lwip/include/lwipopts.h
index 5e29634c34..c92c23cf46 100644
--- a/pkg/lwip/include/lwipopts.h
+++ b/pkg/lwip/include/lwipopts.h
@@ -74,6 +74,12 @@ extern "C" {
 #define LWIP_IPV6_AUTOCONFIG    (0)
 #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
 #define LWIP_IPV6               (1)
 #else  /* MODULE_LWIP_IPV6 */

From eff89c56ef0cedc7068d27d54e7d6f353663c8f1 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Tue, 31 May 2016 21:40:40 +0200
Subject: [PATCH 2/2] tests: add comment about exclusion of MLD in lwIP app

---
 tests/lwip/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile
index 2e1c844b49..c68fb17721 100644
--- a/tests/lwip/Makefile
+++ b/tests/lwip/Makefile
@@ -9,6 +9,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-mega2560 msb-430h nrf6310 \
                              nucleo-f334 pca10005 stm32f0discovery weio \
                              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_udp lwip_conn_udp
 USEMODULE += ipv6_addr