From 468a14b528794121077af1cb113720fb8290cef5 Mon Sep 17 00:00:00 2001
From: kkrentz <konrad.krentz@gmail.com>
Date: Sat, 27 Oct 2018 02:31:28 -0700
Subject: [PATCH] moved initialization of queuebuf to contikimac-main.c

---
 arch/platform/nrf52dk/contiki-conf.h | 4 ++++
 os/contiki-main.c                    | 4 ++++
 os/net/ipv6/sicslowpan.c             | 5 -----
 os/net/mac/csma/csma-output.c        | 1 -
 os/net/mac/tsch/tsch.c               | 3 +--
 os/net/queuebuf.h                    | 6 ++++++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/arch/platform/nrf52dk/contiki-conf.h b/arch/platform/nrf52dk/contiki-conf.h
index 7b3b66314..12d1b2fc9 100644
--- a/arch/platform/nrf52dk/contiki-conf.h
+++ b/arch/platform/nrf52dk/contiki-conf.h
@@ -74,6 +74,10 @@
 
 /* Packet buffer */
 #define PACKETBUF_CONF_SIZE                     1280  /**< Required IPv6 MTU size */
+
+/* Queuebuf */
+#define QUEUEBUF_CONF_ENABLED                   0
+
 /** @} */
 
 /**
diff --git a/os/contiki-main.c b/os/contiki-main.c
index db8893717..43e301746 100644
--- a/os/contiki-main.c
+++ b/os/contiki-main.c
@@ -48,6 +48,7 @@
 #include "sys/stack-check.h"
 #include "dev/watchdog.h"
 
+#include "net/queuebuf.h"
 #include "net/app-layer/coap/coap-engine.h"
 #include "services/rpl-border-router/rpl-border-router.h"
 #include "services/orchestra/orchestra.h"
@@ -89,6 +90,9 @@ main(void)
 
   platform_init_stage_two();
 
+#if QUEUEBUF_ENABLED
+  queuebuf_init();
+#endif /* QUEUEBUF_ENABLED */
   netstack_init();
   node_id_init();
 
diff --git a/os/net/ipv6/sicslowpan.c b/os/net/ipv6/sicslowpan.c
index 9e4e3a8b4..034045e7d 100644
--- a/os/net/ipv6/sicslowpan.c
+++ b/os/net/ipv6/sicslowpan.c
@@ -2061,11 +2061,6 @@ sicslowpan_init(void)
 #endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1 */
 
 #endif /* SICSLOWPAN_COMPRESSION == SICSLOWPAN_COMPRESSION_IPHC */
-
-  /* We use the queuebuf module if fragmentation is enabled */
-#if SICSLOWPAN_CONF_FRAG
-  queuebuf_init();
-#endif
 }
 /*--------------------------------------------------------------------*/
 int
diff --git a/os/net/mac/csma/csma-output.c b/os/net/mac/csma/csma-output.c
index 1773e0cb0..0436bacea 100644
--- a/os/net/mac/csma/csma-output.c
+++ b/os/net/mac/csma/csma-output.c
@@ -539,5 +539,4 @@ csma_output_init(void)
   memb_init(&packet_memb);
   memb_init(&metadata_memb);
   memb_init(&neighbor_memb);
-  queuebuf_init();
 }
diff --git a/os/net/mac/tsch/tsch.c b/os/net/mac/tsch/tsch.c
index 60638eaaf..8a5218355 100644
--- a/os/net/mac/tsch/tsch.c
+++ b/os/net/mac/tsch/tsch.c
@@ -972,8 +972,7 @@ tsch_init(void)
     return;
   }
 
-  /* Init the queuebuf and TSCH sub-modules */
-  queuebuf_init();
+  /* Init TSCH sub-modules */
   tsch_reset();
   tsch_queue_init();
   tsch_schedule_init();
diff --git a/os/net/queuebuf.h b/os/net/queuebuf.h
index 60216465d..ef66da780 100644
--- a/os/net/queuebuf.h
+++ b/os/net/queuebuf.h
@@ -55,6 +55,12 @@
 
 #include "net/packetbuf.h"
 
+#ifdef QUEUEBUF_CONF_ENABLED
+#define QUEUEBUF_ENABLED QUEUEBUF_CONF_ENABLED
+#else /* QUEUEBUF_CONF_ENABLED */
+#define QUEUEBUF_ENABLED 1
+#endif /* QUEUEBUF_CONF_ENABLED */
+
 /* QUEUEBUF_NUM is the total number of queuebuf */
 #ifdef QUEUEBUF_CONF_NUM
 #define QUEUEBUF_NUM QUEUEBUF_CONF_NUM