From 9039b0ecd8f441539c3ec382e1294698cc0b5989 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Wed, 20 Nov 2013 14:09:42 +0100 Subject: [PATCH] Remove references to the now unused dag->parents list --- core/net/rpl/rpl-dag.c | 4 +--- core/net/rpl/rpl.h | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index d2593f97c..8f228e37b 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -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)); PRINTF("\n"); - list_remove(dag_src->parents, parent); parent->dag = dag_dst; - list_add(dag_dst->parents, parent); } /*---------------------------------------------------------------------------*/ 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) { rpl_reset_dio_timer(instance); } - + /* Prefix Information Option treated to add new prefix */ if(dio->prefix_info.length != 0) { if(dio->prefix_info.flags & UIP_ND6_RA_FLAG_AUTONOMOUS) { diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h index 5dc1f6e1c..8488a0f1f 100644 --- a/core/net/rpl/rpl.h +++ b/core/net/rpl/rpl.h @@ -45,9 +45,6 @@ #include "net/uip-ds6.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_ocp_t; @@ -142,7 +139,6 @@ struct rpl_dag { rpl_parent_t *preferred_parent; rpl_rank_t rank; struct rpl_instance *instance; - LIST_STRUCT(parents); rpl_prefix_t prefix_info; }; typedef struct rpl_dag rpl_dag_t;