michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: rpl: Fix a build issue

Browse source 
s/energy_est/estimation when using net_rpl_node_energy_object.

Change-Id: I4b326a0dbbca11d48de0c595dfe843495fe10e04
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2016-12-28 16:25:05 +01:00
commit 8ab2a90231
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/net/ip/rpl-mrhof.c
View file

@ -199,7 +199,7 @@ static uint16_t calculate_path_metric(struct net_rpl_parent *parent)
return parent->mc.obj.etx + net_ipv6_nbr_data(nbr)->link_metric;
#elif defined(CONFIG_NET_RPL_MC_ENERGY)
return parent->mc.obj.energy.energy_est +
return parent->mc.obj.energy.estimation +
net_ipv6_nbr_data(nbr)->link_metric;
#else
#error "Unsupported routing metric configured"
@ -361,7 +361,7 @@ static int net_rpl_mrhof_update_mc(struct net_rpl_instance *instance)
}
instance->mc.obj.energy.flags = type << NET_RPL_MC_ENERGY_TYPE;
instance->mc.obj.energy.energy_est = path_metric;
instance->mc.obj.energy.estimation = path_metric;
#endif
return 0;