deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: must multiply with ETX divisor to turn into fixed-point format.

Browse source
This commit is contained in:
Adam Dunkels 2013-08-12 00:12:29 +02:00 committed by Simon Duquennoy
parent 4d0ecaae02
commit d0a939afb0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/rpl/rpl-mrhof.c
View file

@ -113,11 +113,11 @@ neighbor_link_callback(rpl_parent_t *p, int status, int numtx)
/* Do not penalize the ETX when collisions or transmission errors occur. */ /* Do not penalize the ETX when collisions or transmission errors occur. */
if(status == MAC_TX_OK || status == MAC_TX_NOACK) { if(status == MAC_TX_OK || status == MAC_TX_NOACK) {
int recorded_etx = p->link_metric; int recorded_etx = p->link_metric;
int packet_etx = numtx; int packet_etx = numtx * RPL_DAG_MC_ETX_DIVISOR;
int new_etx; int new_etx;
if(status == MAC_TX_NOACK) { if(status == MAC_TX_NOACK) {
packet_etx = MAX_LINK_METRIC; packet_etx = MAX_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
} }
new_etx = ((uint16_t)recorded_etx * ETX_ALPHA + new_etx = ((uint16_t)recorded_etx * ETX_ALPHA +