From 91206e22499365fef187795a3c94b44f3157ac95 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Wed, 21 Nov 2012 19:48:54 +0100 Subject: [PATCH] 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