From 428e085c533f4160aef179adda8d3c30376e4fbb Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Fri, 11 Jul 2014 16:24:33 +0200 Subject: [PATCH 1/3] sys/shell: fix error when not using sixlowpan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` /sys/shell/commands/sc_net_if.c:631:27: error: ‘IPV6_MAX_ADDR_STR_LEN’ undeclared (first use in this function) char addr_str[IPV6_MAX_ADDR_STR_LEN]; ^ ``` --- sys/shell/commands/sc_net_if.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/shell/commands/sc_net_if.c b/sys/shell/commands/sc_net_if.c index f431c56a45..5bd9ce1b17 100644 --- a/sys/shell/commands/sc_net_if.c +++ b/sys/shell/commands/sc_net_if.c @@ -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(""); From a49f16b1ea21c985f1ba88734d403f78dbda7f13 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Sat, 12 Jul 2014 15:11:18 +0200 Subject: [PATCH 2/3] make: model net_if dependency on net_help --- Makefile.dep | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.dep b/Makefile.dep index b5ad4cc1c7..83ec715b7e 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -71,6 +71,7 @@ endif ifneq (,$(filter net_if,$(USEMODULE))) USEMODULE += transceiver + USEMODULE += net_help endif ifneq (,$(filter ccn_lite,$(USEMODULE))) From 44d6afd5adfe19ce670b9e5e2f37a0d0f4d996e1 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Mon, 14 Jul 2014 18:02:14 +0200 Subject: [PATCH 3/3] make: replace spaces with tabs in Makefile.dep --- Makefile.dep | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 83ec715b7e..f7391c92b5 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -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,7 +71,7 @@ endif ifneq (,$(filter net_if,$(USEMODULE))) USEMODULE += transceiver - USEMODULE += net_help + USEMODULE += net_help endif ifneq (,$(filter ccn_lite,$(USEMODULE)))