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

Merge pull request #1849 from MohamedSeliem/patch3

Browse source 
Make UIP_CONF_DS6_ROUTE_NBU and DS6_NBR_NBU, DS6_ROUTE_NBU obsolete
This commit is contained in:
Nicolas Tsiftes 2016-09-12 14:25:59 +02:00 committed by GitHub
parent 8bf235ef86 1d32a00ebd
commit 2d49edfc57
6 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/net/ipv6/uip-ds6-route.h
View file

@ -82,14 +82,10 @@ void uip_ds6_notification_rm(struct uip_ds6_notification *n);
#endif #endif
/* Routing table */ /* Routing table */
#ifndef UIP_CONF_MAX_ROUTES #ifdef UIP_CONF_MAX_ROUTES
#ifdef UIP_CONF_DS6_ROUTE_NBU
#define UIP_DS6_ROUTE_NB UIP_CONF_DS6_ROUTE_NBU
#else /* UIP_CONF_DS6_ROUTE_NBU */
#define UIP_DS6_ROUTE_NB 4
#endif /* UIP_CONF_DS6_ROUTE_NBU */
#else /* UIP_CONF_MAX_ROUTES */
#define UIP_DS6_ROUTE_NB UIP_CONF_MAX_ROUTES #define UIP_DS6_ROUTE_NB UIP_CONF_MAX_ROUTES
#else /* UIP_CONF_MAX_ROUTES */
#define UIP_DS6_ROUTE_NB 4
#endif /* UIP_CONF_MAX_ROUTES */ #endif /* UIP_CONF_MAX_ROUTES */
/** \brief define some additional RPL related route state and /** \brief define some additional RPL related route state and

2
core/net/ipv6/uip-ds6.h
View file

@ -56,6 +56,8 @@
* - the number of elements requested by the user in contiki configuration (name suffixed by _NBU) * - the number of elements requested by the user in contiki configuration (name suffixed by _NBU)
* - the number of elements assigned by the system (name suffixed by _NBS) * - the number of elements assigned by the system (name suffixed by _NBS)
* - the total number of elements is the sum (name suffixed by _NB) * - the total number of elements is the sum (name suffixed by _NB)
* The routing table definitions can be found in uip-ds6-route.h
* The Neighbor cache definitions can be found in nbr-table.h
*/ */
/* Default router list */ /* Default router list */

8
examples/ipv6/multicast/project-conf.h
View file

@ -60,9 +60,9 @@
#define UIP_CONF_TCP 0 #define UIP_CONF_TCP 0
/* Code/RAM footprint savings so that things will fit on our device */ /* Code/RAM footprint savings so that things will fit on our device */
#undef UIP_CONF_DS6_NBR_NBU #undef NBR_TABLE_CONF_MAX_NEIGHBORS
#undef UIP_CONF_DS6_ROUTE_NBU #undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_DS6_NBR_NBU 10 #define NBR_TABLE_CONF_MAX_NEIGHBORS 10
#define UIP_CONF_DS6_ROUTE_NBU 10 #define UIP_CONF_MAX_ROUTES 10
#endif /* PROJECT_CONF_H_ */ #endif /* PROJECT_CONF_H_ */

2
platform/mbxxx/contiki-conf.h
View file

@ -109,7 +109,7 @@
#define QUEUEBUF_CONF_NUM 2 #define QUEUEBUF_CONF_NUM 2
#define QUEUEBUF_CONF_REF_NUM 0 #define QUEUEBUF_CONF_REF_NUM 0
#define NBR_TABLE_CONF_MAX_NEIGHBORS 4 #define NBR_TABLE_CONF_MAX_NEIGHBORS 4
#define UIP_CONF_DS6_ROUTE_NBU 4 #define UIP_CONF_MAX_ROUTES 4
#define RPL_CONF_MAX_PARENTS_PER_DAG 4 #define RPL_CONF_MAX_PARENTS_PER_DAG 4
#define RPL_CONF_MAX_INSTANCES 1 #define RPL_CONF_MAX_INSTANCES 1
#define RPL_CONF_MAX_DAG_PER_INSTANCE 1 #define RPL_CONF_MAX_DAG_PER_INSTANCE 1

2
platform/seedeye/contiki-conf.h
View file

@ -93,7 +93,7 @@ typedef uint32_t rtimer_clock_t;
/* IPv6 configuration options */ /* IPv6 configuration options */
#define NETSTACK_CONF_WITH_IPV6 1 #define NETSTACK_CONF_WITH_IPV6 1
#define NBR_TABLE_CONF_MAX_NEIGHBORS 20 /* number of neighbors */ #define NBR_TABLE_CONF_MAX_NEIGHBORS 20 /* number of neighbors */
#define UIP_CONF_DS6_ROUTE_NBU 20 /* number of routes */ #define UIP_CONF_MAX_ROUTES 20 /* number of routes */
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000 #define UIP_CONF_ND6_RETRANS_TIMER 10000

6
platform/stm32nucleo-spirit1/contiki-conf.h
View file

@ -85,9 +85,9 @@
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef UIP_CONF_DS6_ROUTE_NBU #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_DS6_ROUTE_NBU 30 #define UIP_CONF_MAX_ROUTES 30
#endif /* UIP_CONF_DS6_ROUTE_NBU */ #endif /* UIP_CONF_MAX_ROUTES */
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000 /* 90000// 600000 */ #define UIP_CONF_ND6_REACHABLE_TIME 600000 /* 90000// 600000 */