From d51d3f6b3ebe0d5582b2a7bc41ee3eae707ae9f9 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Wed, 21 Nov 2012 19:48:13 +0100 Subject: [PATCH 1/2] Remove conditionals around RPL extension header #defines and typedefs. With the conditional, it wasn't possible to compile the rpl-ext-header.c file. Since #defines and typedefs and 'free' at runtime, we gain nothing by having them conditional. --- core/net/uip.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/net/uip.h b/core/net/uip.h index 3a5ab0fe1..d938f9df0 100644 --- a/core/net/uip.h +++ b/core/net/uip.h @@ -1769,7 +1769,6 @@ typedef struct uip_ext_hdr_opt_padn { uint8_t opt_len; } uip_ext_hdr_opt_padn; -#if UIP_CONF_IPV6_RPL /* RPL option */ typedef struct uip_ext_hdr_opt_rpl { uint8_t opt_type; @@ -1778,7 +1777,6 @@ typedef struct uip_ext_hdr_opt_rpl { uint8_t instance; uint16_t senderrank; } uip_ext_hdr_opt_rpl; -#endif /* UIP_CONF_IPV6_RPL */ /* TCP header */ struct uip_tcp_hdr { @@ -1850,9 +1848,7 @@ struct uip_udp_hdr { /** \brief Destination and Hop By Hop extension headers option types */ #define UIP_EXT_HDR_OPT_PAD1 0 #define UIP_EXT_HDR_OPT_PADN 1 -#if UIP_CONF_IPV6_RPL #define UIP_EXT_HDR_OPT_RPL 0x63 -#endif /* UIP_CONF_IPV6_RPL */ /** @} */ From 91206e22499365fef187795a3c94b44f3157ac95 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Wed, 21 Nov 2012 19:48:54 +0100 Subject: [PATCH 2/2] Avoid multiple definitions of NETSTACK_CONF_MAC. Turn on RPL by default. --- platform/micaz/contiki-conf.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h index 493ed08b1..7547af918 100644 --- a/platform/micaz/contiki-conf.h +++ b/platform/micaz/contiki-conf.h @@ -71,7 +71,6 @@ #define NETSTACK_CONF_NETWORK rime_driver #define NETSTACK_CONF_MAC csma_driver -#define NETSTACK_CONF_MAC nullmac_driver #define NETSTACK_CONF_RDC cxmac_driver #define NETSTACK_CONF_FRAMER framer_802154 @@ -116,7 +115,7 @@ #define UIP_CONF_LLH_LEN 0 #define UIP_CONF_ROUTER 0 -#define UIP_CONF_IPV6_RPL 0 +#define UIP_CONF_IPV6_RPL 1 /* configure number of neighbors and routes */ #define UIP_CONF_DS6_NBR_NBU 5