mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-23 01:29:33 +00:00
Merge pull request #651 from cetic/pr-rpl-private-cleanup-fix
Remove duplicated RPL configuration parameters definition
This commit is contained in:
commit
dbe83c42ab
@ -134,29 +134,6 @@
|
|||||||
|
|
||||||
#define INFINITE_RANK 0xffff
|
#define INFINITE_RANK 0xffff
|
||||||
|
|
||||||
/* Represents 2^n ms. */
|
|
||||||
/* Default value according to the specification is 3 which
|
|
||||||
means 8 milliseconds, but that is an unreasonable value if
|
|
||||||
using power-saving / duty-cycling */
|
|
||||||
#ifdef RPL_CONF_DIO_INTERVAL_MIN
|
|
||||||
#define RPL_DIO_INTERVAL_MIN RPL_CONF_DIO_INTERVAL_MIN
|
|
||||||
#else
|
|
||||||
#define RPL_DIO_INTERVAL_MIN 12
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Maximum amount of timer doublings. */
|
|
||||||
#ifdef RPL_CONF_DIO_INTERVAL_DOUBLINGS
|
|
||||||
#define RPL_DIO_INTERVAL_DOUBLINGS RPL_CONF_DIO_INTERVAL_DOUBLINGS
|
|
||||||
#else
|
|
||||||
#define RPL_DIO_INTERVAL_DOUBLINGS 8
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Default DIO redundancy. */
|
|
||||||
#ifdef RPL_CONF_DIO_REDUNDANCY
|
|
||||||
#define RPL_DIO_REDUNDANCY RPL_CONF_DIO_REDUNDANCY
|
|
||||||
#else
|
|
||||||
#define RPL_DIO_REDUNDANCY 10
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Expire DAOs from neighbors that do not respond in this time. (seconds) */
|
/* Expire DAOs from neighbors that do not respond in this time. (seconds) */
|
||||||
#define DAO_EXPIRATION_TIMEOUT 60
|
#define DAO_EXPIRATION_TIMEOUT 60
|
||||||
|
Loading…
Reference in New Issue
Block a user