kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 14:03:55 +01:00
Code Releases Activity

Merge #19066

Browse Source 
19066: examples/gnrc_border_router: Restore UHCP conditional default r=chrysn a=chrysn

The space inside the expression made the ifneq always non-equal; the intended behavior is "if we're using any of these interfaces, or REUSE_TAP is set".

Co-authored-by: chrysn <chrysn@fsfe.org>
This commit is contained in:
bors[bot] 2022-12-20 16:40:57 +00:00 committed by GitHub
commit cc0371c712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gnrc_border_router/Makefile
View File

@ -43,7 +43,7 @@ USEMODULE += ps
#USEMODULE += gnrc_ipv6_nib_dns # include RDNSS option handling
# When using a regular network uplink we should use DHCPv6
ifneq (,$(filter cdc-ecm wifi ethernet,$(UPLINK)) $(REUSE_TAP))
ifneq (,$(filter cdc-ecm wifi ethernet,$(UPLINK))$(REUSE_TAP))
PREFIX_CONF ?= dhcpv6
else
PREFIX_CONF ?= uhcp