From 89ec411b79a1223d4c03278561fafa36d7a5df08 Mon Sep 17 00:00:00 2001
From: Martine Lenders <authmillenon@gmail.com>
Date: Wed, 8 Nov 2017 19:23:39 +0100
Subject: [PATCH] Revert "gnrc_uhcpc: fix dependencies"
---
Makefile.dep | 4 ----
sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c | 7 ++-----
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Makefile.dep b/Makefile.dep
index 3323dbb026..38b432a31d 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -51,10 +51,6 @@ ifneq (,$(filter gnrc_uhcpc,$(USEMODULE)))
USEMODULE += fmt
endif
-ifneq (,$(filter uhcpc,$(USEMODULE)))
- USEMODULE += posix
-endif
-
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
USEMODULE += softdevice_handler
USEMODULE += ble_common
diff --git a/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c b/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
index ffe594e22d..a881adc221 100644
--- a/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
+++ b/sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
@@ -32,21 +32,18 @@ static void set_interface_roles(void)
kernel_pid_t dev = ifs[i];
int is_wired = gnrc_netapi_get(dev, NETOPT_IS_WIRED, 0, NULL, 0);
if ((!gnrc_border_interface) && (is_wired == 1)) {
- ipv6_addr_t addr;
+ ipv6_addr_t addr, defroute;
gnrc_border_interface = dev;
ipv6_addr_from_str(&addr, "fe80::2");
gnrc_ipv6_netif_add_addr(dev, &addr, 64,
GNRC_IPV6_NETIF_ADDR_FLAGS_UNICAST);
-#ifdef MODULE_FIB
- ipv6_addr_t defroute = IPV6_ADDR_UNSPECIFIED;
-
+ ipv6_addr_from_str(&defroute, "::");
ipv6_addr_from_str(&addr, "fe80::1");
fib_add_entry(&gnrc_ipv6_fib_table, dev, defroute.u8, 16,
0x00, addr.u8, 16, 0,
(uint32_t)FIB_LIFETIME_NO_EXPIRE);
-#endif
}
else if ((!gnrc_wireless_interface) && (is_wired != 1)) {
gnrc_wireless_interface = dev;
--
GitLab