riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "gnrc_uhcpc: fix dependencies"

Browse Source
This commit is contained in:
Martine Lenders 2017-11-08 19:23:39 +01:00 committed by GitHub
parent 847c4da441
commit 89ec411b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.dep
View File

@ -51,10 +51,6 @@ ifneq (,$(filter gnrc_uhcpc,$(USEMODULE)))
USEMODULE += fmt USEMODULE += fmt
endif endif
ifneq (,$(filter uhcpc,$(USEMODULE)))
USEMODULE += posix
endif
ifneq (,$(filter nordic_softdevice_ble,$(USEPKG))) ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
USEMODULE += softdevice_handler USEMODULE += softdevice_handler
USEMODULE += ble_common USEMODULE += ble_common

7
sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
View File

@ -32,21 +32,18 @@ static void set_interface_roles(void)
kernel_pid_t dev = ifs[i]; kernel_pid_t dev = ifs[i];
int is_wired = gnrc_netapi_get(dev, NETOPT_IS_WIRED, 0, NULL, 0); int is_wired = gnrc_netapi_get(dev, NETOPT_IS_WIRED, 0, NULL, 0);
if ((!gnrc_border_interface) && (is_wired == 1)) { if ((!gnrc_border_interface) && (is_wired == 1)) {
ipv6_addr_t addr; ipv6_addr_t addr, defroute;
gnrc_border_interface = dev; gnrc_border_interface = dev;
ipv6_addr_from_str(&addr, "fe80::2"); ipv6_addr_from_str(&addr, "fe80::2");
gnrc_ipv6_netif_add_addr(dev, &addr, 64, gnrc_ipv6_netif_add_addr(dev, &addr, 64,
GNRC_IPV6_NETIF_ADDR_FLAGS_UNICAST); GNRC_IPV6_NETIF_ADDR_FLAGS_UNICAST);
#ifdef MODULE_FIB ipv6_addr_from_str(&defroute, "::");
ipv6_addr_t defroute = IPV6_ADDR_UNSPECIFIED;
ipv6_addr_from_str(&addr, "fe80::1"); ipv6_addr_from_str(&addr, "fe80::1");
fib_add_entry(&gnrc_ipv6_fib_table, dev, defroute.u8, 16, fib_add_entry(&gnrc_ipv6_fib_table, dev, defroute.u8, 16,
0x00, addr.u8, 16, 0, 0x00, addr.u8, 16, 0,
(uint32_t)FIB_LIFETIME_NO_EXPIRE); (uint32_t)FIB_LIFETIME_NO_EXPIRE);
#endif
} }
else if ((!gnrc_wireless_interface) && (is_wired != 1)) { else if ((!gnrc_wireless_interface) && (is_wired != 1)) {
gnrc_wireless_interface = dev; gnrc_wireless_interface = dev;