Merge branch 'master' into qidevices

Signed-off-by: Benoît Thébaudeau <[email protected]>
ADVANSEE · Nov 15, 2013 · b86c91e · b86c91e
2 parents 126f8f2 + d08a878
commit b86c91e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
@@ -1173,6 +1173,11 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
     return;
   }
 
+  if(instance->current_dag->rank == ROOT_RANK(instance) && instance->current_dag != dag) {
+    PRINTF("RPL: Root ignored DIO for different DAG\n");
+    return;
+  }
+
   if(dag == NULL) {
     PRINTF("RPL: Adding new DAG to known instance.\n");
     rpl_add_dag(from, dio);