Merge pull request #1637 from simonduq/pr/rpl-default-lifetime

RPL default lifetime
This commit is contained in:
Simon Duquennoy 2016-04-27 18:18:47 +02:00
commit 24449e9cba

View file

@ -200,7 +200,7 @@
* used in RPL lifetime values, in seconds. * used in RPL lifetime values, in seconds.
*/ */
#ifndef RPL_CONF_DEFAULT_LIFETIME_UNIT #ifndef RPL_CONF_DEFAULT_LIFETIME_UNIT
#define RPL_DEFAULT_LIFETIME_UNIT 0x60 #define RPL_DEFAULT_LIFETIME_UNIT 60
#else #else
#define RPL_DEFAULT_LIFETIME_UNIT RPL_CONF_DEFAULT_LIFETIME_UNIT #define RPL_DEFAULT_LIFETIME_UNIT RPL_CONF_DEFAULT_LIFETIME_UNIT
#endif #endif
@ -209,7 +209,7 @@
* Default route lifetime as a multiple of the lifetime unit. * Default route lifetime as a multiple of the lifetime unit.
*/ */
#ifndef RPL_CONF_DEFAULT_LIFETIME #ifndef RPL_CONF_DEFAULT_LIFETIME
#define RPL_DEFAULT_LIFETIME 0x30 #define RPL_DEFAULT_LIFETIME 30
#else #else
#define RPL_DEFAULT_LIFETIME RPL_CONF_DEFAULT_LIFETIME #define RPL_DEFAULT_LIFETIME RPL_CONF_DEFAULT_LIFETIME
#endif #endif