giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-4.1' into contrib/release-into-develop

Browse Source
This commit is contained in:
Simon Duquennoy 2018-05-11 05:52:42 -07:00
commit a4c3e4373f
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/net/link-stats.c
View File

@ -64,7 +64,7 @@
/* ETX fixed point divisor. 128 is the value used by RPL (RFC 6551 and RFC 6719) */
#define ETX_DIVISOR LINK_STATS_ETX_DIVISOR
/* Number of Tx used to update the ETX EWMA in case of no-ACK */
#define ETX_NOACK_PENALTY 16
#define ETX_NOACK_PENALTY 20
/* Initial ETX value */
#define ETX_DEFAULT 2

17
os/net/routing/rpl-classic/rpl-mrhof.c
View File

@ -56,14 +56,19 @@
/* RFC6551 and RFC6719 do not mandate the use of a specific formula to
* compute the ETX value. This MRHOF implementation relies on the value
* computed by the link-stats module. It has an optional feature,
* computed by the link-stats module.It has an optional feature,
* RPL_MRHOF_CONF_SQUARED_ETX, that consists in squaring this value.
* This basically penalizes bad links while preserving the semantics of ETX
*
* Squaring basically penalizes bad links while preserving the semantics of ETX
* (1 = perfect link, more = worse link). As a result, MRHOF will favor
* good links over short paths. Recommended when reliability is a priority.
* Without this feature, a hop with 50% PRR (ETX=2) is equivalent to two
* perfect hops with 100% PRR (ETX=1+1=2). With this feature, the former
* path obtains ETX=2*2=4 and the former ETX=1*1+1*1=2. */
* good links over short paths. Without this feature, a hop with 50% PRR (ETX=2)
* is equivalent to two perfect hops with 100% PRR (ETX=1+1=2). With this
* feature, the former path obtains ETX=2*2=4 and the former ETX=1*1+1*1=2.
*
* While this feature helps achieve extra relaibility, it also results in
* added churn. In networks with high congestion or poor links, this can lead
* to poor connectivity due to more parent switches, loops, Trickle resets, etc.
*/
#ifdef RPL_MRHOF_CONF_SQUARED_ETX
#define RPL_MRHOF_SQUARED_ETX RPL_MRHOF_CONF_SQUARED_ETX
#else /* RPL_MRHOF_CONF_SQUARED_ETX */

19
os/net/routing/rpl-lite/rpl-mrhof.c
View File

@ -56,18 +56,23 @@
/* RFC6551 and RFC6719 do not mandate the use of a specific formula to
* compute the ETX value. This MRHOF implementation relies on the value
* computed by the link-stats module. It has an optional feature,
* computed by the link-stats module.It has an optional feature,
* RPL_MRHOF_CONF_SQUARED_ETX, that consists in squaring this value.
* This basically penalizes bad links while preserving the semantics of ETX
*
* Squaring basically penalizes bad links while preserving the semantics of ETX
* (1 = perfect link, more = worse link). As a result, MRHOF will favor
* good links over short paths. Recommended when reliability is a priority.
* Without this feature, a hop with 50% PRR (ETX=2) is equivalent to two
* perfect hops with 100% PRR (ETX=1+1=2). With this feature, the former
* path obtains ETX=2*2=4 and the former ETX=1*1+1*1=2. */
* good links over short paths. Without this feature, a hop with 50% PRR (ETX=2)
* is equivalent to two perfect hops with 100% PRR (ETX=1+1=2). With this
* feature, the former path obtains ETX=2*2=4 and the former ETX=1*1+1*1=2.
*
* While this feature helps achieve extra relaibility, it also results in
* added churn. In networks with high congestion or poor links, this can lead
* to poor connectivity due to more parent switches, loops, Trickle resets, etc.
*/
#ifdef RPL_MRHOF_CONF_SQUARED_ETX
#define RPL_MRHOF_SQUARED_ETX RPL_MRHOF_CONF_SQUARED_ETX
#else /* RPL_MRHOF_CONF_SQUARED_ETX */
#define RPL_MRHOF_SQUARED_ETX 1
#define RPL_MRHOF_SQUARED_ETX 0
#endif /* RPL_MRHOF_CONF_SQUARED_ETX */
/* Configuration parameters of RFC6719. Reject parents that have a higher