From c4f89ee44da62b36ec5cbe8403a7214607ff7dfb Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@gmail.com>
Date: Wed, 11 Oct 2017 17:22:13 +0200
Subject: [PATCH] Minor changes to contiki-default-conf.h

---
 os/contiki-default-conf.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/os/contiki-default-conf.h b/os/contiki-default-conf.h
index 0a93a4313..7dbd1c8b0 100644
--- a/os/contiki-default-conf.h
+++ b/os/contiki-default-conf.h
@@ -33,12 +33,14 @@
 #define CONTIKI_DEFAULT_CONF_H
 
 /*---------------------------------------------------------------------------*/
-/* Packet buffer size options.
- *
- * The packet buffer size options can be tweaked on a per-project
- * basis to reduce memory consumption.
+/* Link-layer options
  */
 
+/* IEEE802154_CONF_PANID defines the default PAN ID for IEEE 802.15.4 networks */
+#ifndef IEEE802154_CONF_PANID
+#define IEEE802154_CONF_PANID 0xabcd
+#endif /* IEEE802154_CONF_PANID */
+
 /* QUEUEBUF_CONF_NUM specifies the number of queue buffers. Queue
    buffers are used throughout the Contiki netstack but the
    configuration option can be tweaked to save memory. Performance can
@@ -107,7 +109,7 @@
 /* UIP_CONF_TCP_CONNS specifies the maximum number of
    simultaneous TCP connections. */
 #ifndef UIP_CONF_TCP_CONNS
-#define UIP_CONF_TCP_CONNS 8
+#define UIP_CONF_TCP_CONNS ((UIP_CONF_TCP) ? 8 : 0)
 #endif /* UIP_CONF_TCP_CONNS */
 
 /* UIP_CONF_ND6_SEND_RA enables standard IPv6 Router Advertisement.