kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-28 16:01:18 +01:00
Code Releases Activity

Merge pull request #1401 from LudwigOrtmann/scnetif_error

Browse Source 
sys/net_if, make: fixup
This commit is contained in:
René Kijewski 2014-07-15 01:18:43 +02:00
commit d4ff405e21
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile.dep
View File

@ -9,29 +9,29 @@ ifneq (,$(filter pnet,$(USEMODULE)))
endif
ifneq (,$(filter destiny,$(USEMODULE)))
USEMODULE += sixlowpan
USEMODULE += net_help
USEMODULE += vtimer
USEMODULE += sixlowpan
USEMODULE += net_help
USEMODULE += vtimer
endif
ifneq (,$(filter sixlowborder,$(USEMODULE)))
USEMODULE += sixlowpan
USEMODULE += sixlowpan
endif
ifneq (,$(filter rpl,$(USEMODULE)))
USEMODULE += routing
USEMODULE += routing
endif
ifneq (,$(filter routing,$(USEMODULE)))
USEMODULE += sixlowpan
USEMODULE += sixlowpan
endif
ifneq (,$(filter sixlowpan,$(USEMODULE)))
USEMODULE += ieee802154
USEMODULE += net_help
USEMODULE += net_if
USEMODULE += posix
USEMODULE += vtimer
USEMODULE += ieee802154
USEMODULE += net_help
USEMODULE += net_if
USEMODULE += posix
USEMODULE += vtimer
endif
ifneq (,$(filter posix,$(USEMODULE)))
@ -71,6 +71,7 @@ endif
ifneq (,$(filter net_if,$(USEMODULE)))
USEMODULE += transceiver
USEMODULE += net_help
endif
ifneq (,$(filter ccn_lite,$(USEMODULE)))

2
sys/shell/commands/sc_net_if.c
View File

@ -627,6 +627,7 @@ void _net_if_ifconfig_list(int if_id)
puts("\n");
}
#ifdef MODULE_SIXLOWPAN
if (addr_ptr->addr_protocol & NET_IF_L3P_IPV6) {
char addr_str[IPV6_MAX_ADDR_STR_LEN];
printf(" inet6 addr: ");
@ -660,6 +661,7 @@ void _net_if_ifconfig_list(int if_id)
printf("error in conversion\n");
}
}
#endif
}
puts("");