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

Merge pull request #313 from simonduq/contrib/remove-old-flags

Browse Source 
Removing obsolete flag RPL_NS_LINK_NUM
This commit is contained in:
George Oikonomou 2018-02-25 00:27:15 +00:00 committed by GitHub
commit fa92115099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/6tisch/sixtop/project-conf.h
View File

@ -82,7 +82,7 @@
/* Save some space to fit the limited RAM of the z1 */ /* Save some space to fit the limited RAM of the z1 */
#define UIP_CONF_TCP 0 #define UIP_CONF_TCP 0
#define QUEUEBUF_CONF_NUM 2 #define QUEUEBUF_CONF_NUM 2
#define RPL_NS_CONF_LINK_NUM 2 #define NETSTACK_MAX_ROUTE_ENTRIES 2
#define NBR_TABLE_CONF_MAX_NEIGHBORS 2 #define NBR_TABLE_CONF_MAX_NEIGHBORS 2
#define UIP_CONF_ND6_SEND_NA 0 #define UIP_CONF_ND6_SEND_NA 0
#define SICSLOWPAN_CONF_FRAG 0 #define SICSLOWPAN_CONF_FRAG 0

13
os/net/routing/rpl-lite/rpl-conf.h
View File

@ -29,7 +29,7 @@
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
*/ */
/** /**
* \addtogroup rpl-lite * \addtogroup rpl-lite
* @{ * @{
@ -73,17 +73,6 @@
#define RPL_WITH_NON_STORING (RPL_MOP_DEFAULT == RPL_MOP_NON_STORING) #define RPL_WITH_NON_STORING (RPL_MOP_DEFAULT == RPL_MOP_NON_STORING)
#endif /* RPL_CONF_WITH_NON_STORING */ #endif /* RPL_CONF_WITH_NON_STORING */
/* The number of non-storing nodes, i.e. the maximum netwrok size at the root */
#ifdef RPL_NS_CONF_LINK_NUM
#define RPL_NS_LINK_NUM RPL_NS_CONF_LINK_NUM
#else /* RPL_NS_CONF_LINK_NUM */
#if RPL_WITH_NON_STORING
#define RPL_NS_LINK_NUM NETSTACK_MAX_ROUTE_ENTRIES
#else
#define RPL_NS_LINK_NUM 0
#endif
#endif /* RPL_NS_CONF_LINK_NUM */
/* /*
* The objective function (OF) used by a RPL root is configurable through * The objective function (OF) used by a RPL root is configurable through
* the RPL_CONF_OF_OCP parameter. This is defined as the objective code * the RPL_CONF_OF_OCP parameter. This is defined as the objective code