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 */ /** @} */ 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