-
-
Save miri64/1d595b5c3ccee1904a0f20bc67a369e1 to your computer and use it in GitHub Desktop.
Patch for testing https://github.com/RIOT-OS/RIOT/pull/10477#pullrequestreview-187024211
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile | |
index cb80550..d693990 100644 | |
--- a/examples/gnrc_border_router/Makefile | |
+++ b/examples/gnrc_border_router/Makefile | |
@@ -26,11 +26,11 @@ BOARD_BLACKLIST += mips-malta pic32-wifire pic32-clicker ruuvitag thingy52 | |
# UART, but not on native, as native has a tap interface towards the host. | |
ifeq (,$(filter native,$(BOARD))) | |
GNRC_NETIF_NUMOF := 2 | |
- USEMODULE += ethos | |
+ # USEMODULE += ethos | |
# ethos baudrate can be configured from make command | |
ETHOS_BAUDRATE ?= 115200 | |
- CFLAGS += -DETHOS_BAUDRATE=$(ETHOS_BAUDRATE) -DUSE_ETHOS_FOR_STDIO | |
+ # CFLAGS += -DETHOS_BAUDRATE=$(ETHOS_BAUDRATE) -DUSE_ETHOS_FOR_STDIO | |
else | |
GNRC_NETIF_NUMOF := 2 | |
TERMFLAGS += -z [::1]:17754 | |
@@ -42,19 +42,19 @@ endif | |
# forget to comment the lines above for ethos. | |
#ifeq (,$(SLIP_UART)) | |
# set default (last available UART) | |
-#SLIP_UART="UART_DEV(UART_NUMOF-1)" | |
+SLIP_UART="UART_DEV(UART_NUMOF-1)" | |
#endif | |
#ifeq (,$(SLIP_BAUDRATE)) | |
# set default | |
-#SLIP_BAUDRATE=115200 | |
+SLIP_BAUDRATE=115200 | |
#endif | |
-#GNRC_NETIF_NUMOF := 2 | |
-#INCLUDES += -I$(CURDIR) | |
-#CFLAGS += -DSLIP_UART=$(SLIP_UART) | |
-#CFLAGS += -DSLIP_BAUDRATE=$(SLIP_BAUDRATE) | |
+GNRC_NETIF_NUMOF := 2 | |
+INCLUDES += -I$(CURDIR) | |
+CFLAGS += -DSLIP_UART=$(SLIP_UART) | |
+CFLAGS += -DSLIP_BAUDRATE=$(SLIP_BAUDRATE) | |
# Include SLIP package for IP over Serial communication | |
-#USEMODULE += slipdev | |
+USEMODULE += slipdev | |
# Include packages that pull up and auto-init the link layer. | |
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present | |
@@ -97,8 +97,8 @@ uhcpd-daemon: host-tools | |
$(RIOTTOOLS)/uhcpd/bin/uhcpd $(TAP) $(IPV6_PREFIX) & | |
else | |
# We override the `make term` command to use ethos | |
-TERMPROG ?= sudo sh $(RIOTTOOLS)/ethos/start_network.sh | |
-TERMFLAGS ?= $(PORT) $(TAP) $(IPV6_PREFIX) | |
+# TERMPROG ?= sudo sh $(RIOTTOOLS)/ethos/start_network.sh | |
+# TERMFLAGS ?= $(PORT) $(TAP) $(IPV6_PREFIX) | |
# We depend on the ethos host tools to run the border router, we build them | |
# if necessary | |
diff --git a/sys/net/gnrc/netif/gnrc_netif.c b/sys/net/gnrc/netif/gnrc_netif.c | |
index f672ac4..df80cda 100644 | |
--- a/sys/net/gnrc/netif/gnrc_netif.c | |
+++ b/sys/net/gnrc/netif/gnrc_netif.c | |
@@ -35,7 +35,7 @@ | |
#include "net/gnrc/netif.h" | |
#include "net/gnrc/netif/internal.h" | |
-#define ENABLE_DEBUG (0) | |
+#define ENABLE_DEBUG (1) | |
#include "debug.h" | |
#define _NETIF_NETAPI_MSG_QUEUE_SIZE (8) | |
diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | |
index f21a10f..872eddb 100644 | |
--- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | |
+++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | |
@@ -34,7 +34,7 @@ | |
#include "net/gnrc/ipv6.h" | |
-#define ENABLE_DEBUG (0) | |
+#define ENABLE_DEBUG (1) | |
#include "debug.h" | |
#define _MAX_L2_ADDR_LEN (8U) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment