Merge remote-tracking branch 'origin/master' into ieee802154

include/nuttx/net/sixlowpan.h

@@ -63,6 +63,17 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* By default, a 2-byte Rime address is used for the IEEE802.15.4 MAC
+ * device's link  layer address.  If CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
+ * is selected, then an 8-byte Rime address will be used.
+ */
+
+#ifdef CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
+#  define NET_6LOWPAN_RIMEADDR_SIZE 8
+#else
+#  define NET_6LOWPAN_RIMEADDR_SIZE 2
+#endif
+
 /* Frame format definitions *************************************************/
 /* Fragment header.
  *
@@ -374,7 +385,7 @@
 
 struct rimeaddr_s
 {
-  uint8_t u8[CONFIG_NET_6LOWPAN_RIMEADDR_SIZE];
+  uint8_t u8[NET_6LOWPAN_RIMEADDR_SIZE];
 };
 
 /* The device structure for IEEE802.15.4 MAC network device differs from the

include/pthread.h

@@ -352,7 +352,7 @@ typedef int pthread_rwlockattr_t;
 
 #define PTHREAD_RWLOCK_INITIALIZER  {PTHREAD_MUTEX_INITIALIZER, \
                                      PTHREAD_COND_INITIALIZER, \
-                                     0, 0}
+                                     0, 0, false}
 
 #ifdef CONFIG_PTHREAD_CLEANUP
 /* This type describes the pthread cleanup callback (non-standard) */