From 73fcfa42c259443b015ca81c498dd789179341a8 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 7 Mar 2016 17:42:17 +0100
Subject: [PATCH 1/2] TSCH: fix compiler warning that shows up when disabling
 TSCH_LOG_LEVEL

---
 core/net/mac/tsch/tsch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c
index 1d9701e42..4e24ea8da 100644
--- a/core/net/mac/tsch/tsch.c
+++ b/core/net/mac/tsch/tsch.c
@@ -936,6 +936,7 @@ send_packet(mac_callback_t sent, void *ptr)
              tsch_queue_packet_count(addr),
              p->header_len,
              queuebuf_datalen(p->qb));
+      (void)packet_count_before; /* Discard "variable set but unused" warning in case of TSCH_LOG_LEVEL of 0 */
     }
   }
   if(ret != MAC_TX_DEFERRED) {

From 8b63b41b96a0dbcbf78fe3e430ad20f3bfdb51fd Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@inria.fr>
Date: Mon, 7 Mar 2016 17:43:25 +0100
Subject: [PATCH 2/2] TSCH-security: disable TSCH logs to save ROM, relax
 checks in 21-z1-rpl-tsch-security.csc accordingly

---
 examples/ipv6/rpl-tsch/project-conf.h                | 2 +-
 regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h
index 7ecfb74c1..2b602d908 100644
--- a/examples/ipv6/rpl-tsch/project-conf.h
+++ b/examples/ipv6/rpl-tsch/project-conf.h
@@ -153,7 +153,7 @@
 #define TSCH_SCHEDULE_CONF_DEFAULT_LENGTH 2
 /* Reduce log level to make space for security on z1 */
 #undef TSCH_LOG_CONF_LEVEL
-#define TSCH_LOG_CONF_LEVEL 1
+#define TSCH_LOG_CONF_LEVEL 0
 #endif /* WITH_SECURITY */
 
 #endif /* CONTIKI_TARGET_Z1 */
diff --git a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
index a24f7fe5b..e2cda7e44 100644
--- a/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
+++ b/regression-tests/11-ipv6/21-z1-rpl-tsch-security.csc
@@ -270,9 +270,6 @@ make node.z1 TARGET=z1 MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1</commands>
       <script>TIMEOUT(300000); /* Time out after 5 minutes */&#xD;
 &#xD;
 log.log("Waiting for association with security\n");&#xD;
-/* Check that nodes associate with security */&#xD;
-WAIT_UNTIL(msg.startsWith("TSCH: association done, sec 1,"));&#xD;
-log.log("Association with security done\n");&#xD;
 &#xD;
 /* Wait until a node (can only be the DAGRoot) has&#xD;
  * 8 routing entries (i.e. can reach every node) */&#xD;