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

Merge pull request #1215 from joakimeriksson/rpl-child-locking

Browse source 
Move locking of neighbors / children from RPL to uip-ds6-route module
This commit is contained in:
Adam Dunkels 2015-09-02 19:42:45 +02:00
commit 92c1a68b94
5 changed files with 54 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/net/rpl/rpl-dag.c
View file

@ -1408,10 +1408,4 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
p->dtsn = dio->dtsn;
}
/*---------------------------------------------------------------------------*/
void
rpl_lock_parent(rpl_parent_t *p)
{
nbr_table_lock(rpl_parents, p);
}
/*---------------------------------------------------------------------------*/
/** @} */

2
core/net/rpl/rpl-icmp6.c
View file

@ -773,8 +773,6 @@ dao_input(void)
PRINTF("RPL: Neighbor already in neighbor cache\n");
}
rpl_lock_parent(parent);
rep = rpl_add_route(dag, &prefix, prefixlen, &dao_sender_addr);
if(rep == NULL) {
RPL_STAT(rpl_stats.mem_overflows++);

3
core/net/rpl/rpl-private.h
View file

@ -303,9 +303,6 @@ uip_ds6_route_t *rpl_add_route(rpl_dag_t *dag, uip_ipaddr_t *prefix,
int prefix_len, uip_ipaddr_t *next_hop);
void rpl_purge_routes(void);
/* Lock a parent in the neighbor cache. */
void rpl_lock_parent(rpl_parent_t *p);
/* Objective function. */
rpl_of_t *rpl_find_of(rpl_ocp_t);