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

Reduced ETX_LIMIT in order to avoid overflows. Removed ETX_LOSS_PENALTY and set packet_etx to ETX_LIMIT instead upon packet loss.

Browse source
This commit is contained in:
nvt-se 2010-10-21 19:46:21 +00:00
parent a1e7d9c256
commit 6e28b1d3fb
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/net/neighbor-info.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: neighbor-info.c,v 1.11 2010/09/15 15:59:52 nvt-se Exp $ * $Id: neighbor-info.c,v 1.12 2010/10/21 19:46:21 nvt-se Exp $
*/ */
/** /**
* \file * \file
@ -48,16 +48,10 @@
#define PRINTF(...) #define PRINTF(...)
#endif /* DEBUG */ #endif /* DEBUG */
#ifndef ETX_CONF_LIMIT #define ETX_LIMIT 15
#define ETX_LIMIT 31
#else
#define ETX_LIMIT ETX_CONF_LIMIT
#endif /* !ETX_CONF_LIMIT */
#define ETX_SCALE 100 #define ETX_SCALE 100
#define ETX_ALPHA 80 #define ETX_ALPHA 70
#define ETX_FIRST_GUESS 3 #define ETX_FIRST_GUESS 3
#define ETX_LOSS_PENALTY ETX_LIMIT
#define ETX2FIX(etx) ((etx) << 4) #define ETX2FIX(etx) ((etx) << 4)
#define FIX2ETX(fix) ((fix) >> 4) #define FIX2ETX(fix) ((fix) >> 4)
@ -135,7 +129,7 @@ neighbor_info_packet_sent(int status, int numtx)
case MAC_TX_ERR: case MAC_TX_ERR:
case MAC_TX_NOACK: case MAC_TX_NOACK:
default: default:
packet_etx = numtx + ETX_LOSS_PENALTY; packet_etx = ETX_LIMIT;
break; break;
} }