From 8159297bfd48ba270c76240db1142701e114e197 Mon Sep 17 00:00:00 2001
From: Andreas Urke <arurke@gmail.com>
Date: Mon, 19 Oct 2015 17:15:54 +0200
Subject: [PATCH] Add configuration of DIS interval and DIS start delay to
 rpl-conf.h

Make a define for configuration of DIS start delay and move it + existing DIS interval conf into RPL-conf.h
---
 core/net/rpl/rpl-conf.h    | 18 ++++++++++++++++++
 core/net/rpl/rpl-private.h |  7 +------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/core/net/rpl/rpl-conf.h b/core/net/rpl/rpl-conf.h
index f4b2a14fe..d32faf5b2 100644
--- a/core/net/rpl/rpl-conf.h
+++ b/core/net/rpl/rpl-conf.h
@@ -296,4 +296,22 @@
     + random_rand() % (RPL_PROBING_INTERVAL))
 #endif
 
+/*
+ * Interval of DIS transmission
+ */
+#ifdef  RPL_CONF_DIS_INTERVAL
+#define RPL_DIS_INTERVAL                RPL_CONF_DIS_INTERVAL
+#else
+#define RPL_DIS_INTERVAL                60
+#endif
+
+/*
+ * Added delay of first DIS transmission after boot
+ */
+#ifdef  RPL_CONF_DIS_START_DELAY
+#define RPL_DIS_START_DELAY             RPL_CONF_DIS_START_DELAY
+#else
+#define RPL_DIS_START_DELAY             5
+#endif
+
 #endif /* RPL_CONF_H */
diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h
index 6f4764b27..6b043d49d 100644
--- a/core/net/rpl/rpl-private.h
+++ b/core/net/rpl/rpl-private.h
@@ -184,12 +184,7 @@
 
 /* DIS related */
 #define RPL_DIS_SEND                    1
-#ifdef  RPL_DIS_INTERVAL_CONF
-#define RPL_DIS_INTERVAL                RPL_DIS_INTERVAL_CONF
-#else
-#define RPL_DIS_INTERVAL                60
-#endif
-#define RPL_DIS_START_DELAY             5
+
 /*---------------------------------------------------------------------------*/
 /* Lollipop counters */