RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

rpl: remove unnecessary check for multiple instances

Browse Source
This commit is contained in:
Cenk Gündoğan 2015-03-16 09:52:06 +01:00
parent 99e810e9b5
commit a7c3807c29
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/net/routing/rpl/rpl_control_messages.c
View File

@ -523,15 +523,8 @@ void rpl_recv_DIO(void)
int len = DIO_BASE_LEN; int len = DIO_BASE_LEN;
rpl_instance_t *dio_inst = rpl_get_instance(rpl_dio_buf->rpl_instanceid); rpl_instance_t *dio_inst = rpl_get_instance(rpl_dio_buf->rpl_instanceid);
rpl_instance_t *my_inst = rpl_get_my_instance();
if (dio_inst == NULL) { if (dio_inst == NULL) {
if (my_inst != NULL) {
/* already part of a DODAG -> impossible to join other instance */
DEBUGF("Not joining another DODAG!\n");
return;
}
dio_inst = rpl_new_instance(rpl_dio_buf->rpl_instanceid); dio_inst = rpl_new_instance(rpl_dio_buf->rpl_instanceid);
if (dio_inst == NULL) { if (dio_inst == NULL) {
@ -539,19 +532,6 @@ void rpl_recv_DIO(void)
return; return;
} }
} }
else if (my_inst == NULL) {
DEBUGF("Not joined an instance yet\n");
}
else if (my_inst->id != dio_inst->id) {
/* TODO: Add support support for several instances. */
/* At the moment, nodes can only join one instance, this is
* the instance they join first.
* Instances cannot be switched later on. */
DEBUGF("Ignoring instance - we are %d and got %d\n", my_inst->id, dio_inst->id);
return;
}
rpl_dodag_t dio_dodag; rpl_dodag_t dio_dodag;
memset(&dio_dodag, 0, sizeof(dio_dodag)); memset(&dio_dodag, 0, sizeof(dio_dodag));