From 3d0d2c284fbf030819a0dc083f08ab2c1caa24c2 Mon Sep 17 00:00:00 2001 From: nvt Date: Tue, 17 Apr 2012 23:34:47 +0200 Subject: [PATCH] Changed function names. --- core/net/rpl/rpl-private.h | 6 +++--- core/net/rpl/rpl.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h index f48d31afd..b5dbcca95 100644 --- a/core/net/rpl/rpl-private.h +++ b/core/net/rpl/rpl-private.h @@ -287,9 +287,9 @@ void rpl_process_dio(uip_ipaddr_t *, rpl_dio_t *); int rpl_process_parent_event(rpl_instance_t *, rpl_parent_t *); /* DAG object management. */ -rpl_dag_t *rpl_alloc_dodag(uint8_t, uip_ipaddr_t *); +rpl_dag_t *rpl_alloc_dag(uint8_t, uip_ipaddr_t *); rpl_instance_t *rpl_alloc_instance(uint8_t); -void rpl_free_dodag(rpl_dag_t *); +void rpl_free_dag(rpl_dag_t *); void rpl_free_instance(rpl_instance_t *); /* DAG parent management function. */ @@ -300,7 +300,7 @@ void rpl_nullify_parent(rpl_dag_t *, rpl_parent_t *); void rpl_remove_parent(rpl_dag_t *, rpl_parent_t *); void rpl_move_parent(rpl_dag_t *dag_src, rpl_dag_t *dag_dst, rpl_parent_t *parent); rpl_parent_t *rpl_select_parent(rpl_dag_t *dag); -rpl_dag_t *rpl_select_dodag(rpl_instance_t *instance,rpl_parent_t *parent); +rpl_dag_t *rpl_select_dag(rpl_instance_t *instance,rpl_parent_t *parent); void rpl_recalculate_ranks(void); /* RPL routing table functions. */ diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h index 90bf43626..e2ebb6428 100644 --- a/core/net/rpl/rpl.h +++ b/core/net/rpl/rpl.h @@ -213,8 +213,7 @@ struct rpl_dag { rpl_parent_t *preferred_parent; rpl_rank_t rank; struct rpl_instance *instance; - void *parent_list; - list_t parents; + LIST_STRUCT(parents); rpl_prefix_t prefix_info; }; typedef struct rpl_dag rpl_dag_t;