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

Continued merge with sf master

Browse source
This commit is contained in:
Nicolas Tsiftes 2011-11-21 15:09:19 +01:00
parent 0e32956a63
commit 2b1549bfe8
5 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/net/rpl/rpl-dag.c Normal file → Executable file
View file

@ -567,7 +567,6 @@ rpl_select_dodag(rpl_instance_t * instance, rpl_parent_t *p)
return NULL;
}
<<<<<<< HEAD
if(instance->current_dag != best_dag) {
/* Remove routes installed by DAOs. */
rpl_remove_routes(instance->current_dag);
@ -758,7 +757,7 @@ rpl_get_dodag(uint8_t instance_id, uip_ipaddr_t *dag_id)
for(i = 0; i < RPL_MAX_DODAG_PER_INSTANCE; ++i) {
dag = &instance->dag_table[i];
if(dag->used && !uip_ipaddr_cmp(dag->dag_id, dag_id)) {
if(dag->used && !uip_ipaddr_cmp(&dag->dag_id, dag_id)) {
return dag;
}
}