Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-09-09 08:54:32 +00:00
Code Issues Projects Releases Wiki Activity

Remove references to the now unused dag->parents list

Browse Source
This commit is contained in:
Adam Dunkels 2013-11-20 14:09:42 +01:00
parent 4e6fe7dda6
commit 9039b0ecd8
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/net/rpl/rpl-dag.c
View File

@ -796,9 +796,7 @@ rpl_move_parent(rpl_dag_t *dag_src, rpl_dag_t *dag_dst, rpl_parent_t *parent)
PRINT6ADDR(rpl_get_parent_ipaddr(parent)); PRINT6ADDR(rpl_get_parent_ipaddr(parent));
PRINTF("\n"); PRINTF("\n");
list_remove(dag_src->parents, parent);
parent->dag = dag_dst; parent->dag = dag_dst;
list_add(dag_dst->parents, parent);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
rpl_dag_t * rpl_dag_t *
@ -1212,7 +1210,7 @@ rpl_process_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
} else if(dio->rank == INFINITE_RANK && dag->joined) { } else if(dio->rank == INFINITE_RANK && dag->joined) {
rpl_reset_dio_timer(instance); rpl_reset_dio_timer(instance);
} }
/* Prefix Information Option treated to add new prefix */ /* Prefix Information Option treated to add new prefix */
if(dio->prefix_info.length != 0) { if(dio->prefix_info.length != 0) {
if(dio->prefix_info.flags & UIP_ND6_RA_FLAG_AUTONOMOUS) { if(dio->prefix_info.flags & UIP_ND6_RA_FLAG_AUTONOMOUS) {

4
core/net/rpl/rpl.h
View File

@ -45,9 +45,6 @@
#include "net/uip-ds6.h" #include "net/uip-ds6.h"
#include "sys/ctimer.h" #include "sys/ctimer.h"
/*---------------------------------------------------------------------------*/
/* The amount of parents that this node has in a particular DAG. */
#define RPL_PARENT_COUNT(dag) list_length((dag)->parents)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
typedef uint16_t rpl_rank_t; typedef uint16_t rpl_rank_t;
typedef uint16_t rpl_ocp_t; typedef uint16_t rpl_ocp_t;
@ -142,7 +139,6 @@ struct rpl_dag {
rpl_parent_t *preferred_parent; rpl_parent_t *preferred_parent;
rpl_rank_t rank; rpl_rank_t rank;
struct rpl_instance *instance; struct rpl_instance *instance;
LIST_STRUCT(parents);
rpl_prefix_t prefix_info; rpl_prefix_t prefix_info;
}; };
typedef struct rpl_dag rpl_dag_t; typedef struct rpl_dag rpl_dag_t;