From 2a49608af643acd0ccec7456ced5ec1b49c5aad8 Mon Sep 17 00:00:00 2001
From: spoerk <michael.spoerk@tugraz.at>
Date: Wed, 3 Jan 2018 14:51:23 +0100
Subject: [PATCH] link layer problem fixed

---
 arch/platform/srf06-cc26xx/platform.c   | 10 +++++++---
 examples/ble/ipv6-client/project-conf.h |  6 +++---
 os/contiki-main.c                       |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/arch/platform/srf06-cc26xx/platform.c b/arch/platform/srf06-cc26xx/platform.c
index c2868af13..0d24e6f2c 100644
--- a/arch/platform/srf06-cc26xx/platform.c
+++ b/arch/platform/srf06-cc26xx/platform.c
@@ -107,9 +107,8 @@ set_rf_params(void)
 {
   uint8_t ext_addr[8];
 
-#if MAKE_MAC == MAKE_MAC_OTHER
+#if MAKE_MAC == MAKE_MAC_BLE
   ble_eui64_addr_cpy_to((uint8_t *)&ext_addr);
-  memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
   NETSTACK_RADIO.set_object(RADIO_PARAM_64BIT_ADDR, ext_addr, 8);
 #else
   uint16_t short_addr;
@@ -176,8 +175,13 @@ platform_init_stage_two()
   serial_line_init();
 
   /* Populate linkaddr_node_addr */
+#if MAKE_MAC == MAKE_MAC_BLE
+  uint8_t ext_addr[8];
+  ble_eui64_addr_cpy_to((uint8_t *)&ext_addr);
+  memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
+#else
   ieee_addr_cpy_to(linkaddr_node_addr.u8, LINKADDR_SIZE);
-
+#endif
   fade(LEDS_GREEN);
 }
 /*---------------------------------------------------------------------------*/
diff --git a/examples/ble/ipv6-client/project-conf.h b/examples/ble/ipv6-client/project-conf.h
index 114565066..14b6e8d05 100644
--- a/examples/ble/ipv6-client/project-conf.h
+++ b/examples/ble/ipv6-client/project-conf.h
@@ -50,9 +50,9 @@
 #define NETSTACK_CONF_RADIO                 ble_cc2650_driver
 
 #define LOG_CONF_LEVEL_MAC        LOG_LEVEL_INFO
-#define LOG_CONF_LEVEL_6LOWPAN      LOG_LEVEL_WARN
-#define LOG_CONF_LEVEL_IPV6       LOG_LEVEL_WARN
-#define LOG_CONF_LEVEL_TCPIP      LOG_LEVEL_WARN
+//#define LOG_CONF_LEVEL_6LOWPAN      LOG_LEVEL_WARN
+//#define LOG_CONF_LEVEL_IPV6       LOG_LEVEL_WARN
+//#define LOG_CONF_LEVEL_TCPIP      LOG_LEVEL_WARN
 
 /* BLE L2CAP settings */
 #define BLE_CONF_DEVICE_NAME          "TI CC26xx device"
diff --git a/os/contiki-main.c b/os/contiki-main.c
index deb9413f3..62638c8a7 100644
--- a/os/contiki-main.c
+++ b/os/contiki-main.c
@@ -95,8 +95,6 @@ main(void)
   LOG_INFO_LLADDR(&linkaddr_node_addr);
   LOG_INFO_("\n");
 
-  platform_init_stage_three();
-
 #if NETSTACK_CONF_WITH_IPV6
   {
     uip_ds6_addr_t *lladdr;
@@ -110,6 +108,8 @@ main(void)
   }
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
+  platform_init_stage_three();
+
 #if BUILD_WITH_ORCHESTRA
   orchestra_init();
   LOG_DBG("With Orchestra\n");