1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #17175 from yarrick/dualstack

pkg/lwip: Don't control IPv6 via IPv4 flag
This commit is contained in:
Erik Ekman 2021-11-25 00:59:07 +01:00 committed by GitHub
commit 0de8bfaadc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 17 deletions

View File

@ -33,8 +33,9 @@ USEMODULE += ps
USEMODULE += netdev_default
USEPKG += paho-mqtt
# paho-mqtt depends on TCP support, choose the stack you want
# paho-mqtt depends on TCP support, choose which stacks you want
LWIP_IPV4 ?= 0
LWIP_IPV6 ?= 1
ifneq (0,$(LWIP_IPV4))
USEMODULE += ipv4_addr
@ -42,9 +43,6 @@ ifneq (0,$(LWIP_IPV4))
USEMODULE += lwip_ipv4
USEMODULE += lwip_dhcp_auto
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
LWIP_IPV6 ?= 0
else
LWIP_IPV6 ?= 1
endif
ifneq (0,$(LWIP_IPV6))

View File

@ -1,6 +1,7 @@
include ../Makefile.tests_common
LWIP_IPV4 ?= 0
LWIP_IPV6 ?= 1
ifneq (0, $(LWIP_IPV4))
USEMODULE += ipv4_addr
@ -8,10 +9,6 @@ ifneq (0, $(LWIP_IPV4))
USEMODULE += lwip_ipv4
USEMODULE += lwip_dhcp_auto
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
LWIP_IPV6 ?= 0
else
# use IPv6 as default IP protocol when IPv4 is not explicitly selected
LWIP_IPV6 ?= 1
endif
ifneq (0, $(LWIP_IPV6))

View File

@ -1,6 +1,7 @@
include ../Makefile.tests_common
LWIP_IPV4 ?= 0
LWIP_IPV6 ?= 1
AUX_LOCAL ?= 1
ifneq (0, $(LWIP_IPV4))
@ -8,9 +9,6 @@ ifneq (0, $(LWIP_IPV4))
USEMODULE += lwip_arp
USEMODULE += lwip_ipv4
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
LWIP_IPV6 ?= 0
else
LWIP_IPV6 ?= 1
endif
ifneq (0, $(LWIP_IPV6))

View File

@ -1,15 +1,13 @@
include ../Makefile.tests_common
LWIP_IPV4 ?= 0
LWIP_IPV6 ?= 1
ifneq (0, $(LWIP_IPV4))
USEMODULE += ipv4_addr
USEMODULE += lwip_arp
USEMODULE += lwip_ipv4
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
LWIP_IPV6 ?= 0
else
LWIP_IPV6 ?= 1
endif
ifneq (0, $(LWIP_IPV6))

View File

@ -1,6 +1,7 @@
include ../Makefile.tests_common
LWIP_IPV4 ?= 0
LWIP_IPV6 ?= 1
AUX_LOCAL ?= 1
ifneq (0, $(LWIP_IPV4))
@ -8,9 +9,6 @@ ifneq (0, $(LWIP_IPV4))
USEMODULE += lwip_arp
USEMODULE += lwip_ipv4
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
LWIP_IPV6 ?= 0
else
LWIP_IPV6 ?= 1
endif
ifneq (0, $(LWIP_IPV6))