From d1ac3d691450dbd4be8b2ef405bd970f00213098 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Tue, 11 Apr 2017 15:34:47 +0300 Subject: [PATCH] net: rpl: Fix compilation if MRHOF is enabled Make sure the RPL is compiled ok if CONFIG_NET_RPL_MRHOF is enabled in the configuration. Change-Id: I51fc0e20f854164c7e0374fa6a1ebf1d4e4dbc5b Signed-off-by: Jukka Rissanen --- subsys/net/ip/rpl-mrhof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subsys/net/ip/rpl-mrhof.c b/subsys/net/ip/rpl-mrhof.c index 453f22693a3..6577d7da4cc 100644 --- a/subsys/net/ip/rpl-mrhof.c +++ b/subsys/net/ip/rpl-mrhof.c @@ -304,7 +304,7 @@ static int net_rpl_mrhof_update_mc(struct net_rpl_instance *instance) instance->mc.type = NET_RPL_MC_NONE; return 0; #else - rpl_path_metric_t path_metric; + uint16_t path_metric; struct net_rpl_dag *dag; #if defined(CONFIG_NET_RPL_MC_ENERGY) @@ -321,7 +321,7 @@ static int net_rpl_mrhof_update_mc(struct net_rpl_instance *instance) dag = instance->current_dag; - if (!dag->joined) { + if (!net_rpl_dag_is_joined(dag)) { NET_DBG("Cannot update the metric container when not joined."); return -EINVAL; }