diff --git a/net/ip/contiki/rpl/rpl-dag.c b/net/ip/contiki/rpl/rpl-dag.c index 0106f09b351..45e88876de0 100644 --- a/net/ip/contiki/rpl/rpl-dag.c +++ b/net/ip/contiki/rpl/rpl-dag.c @@ -298,13 +298,17 @@ get_dag(uint8_t instance_id, uip_ipaddr_t *dag_id) /*---------------------------------------------------------------------------*/ rpl_dag_t * rpl_set_root(struct net_buf *buf, uint8_t instance_id, uip_ipaddr_t *dag_id) +{ + return rpl_set_root_with_version(buf, instance_id, dag_id, RPL_LOLLIPOP_INIT); +} +/*---------------------------------------------------------------------------*/ +rpl_dag_t * +rpl_set_root_with_version(struct net_buf *buf, uint8_t instance_id, uip_ipaddr_t *dag_id, uint8_t version) { rpl_dag_t *dag; rpl_instance_t *instance; - uint8_t version; int i; - version = RPL_LOLLIPOP_INIT; instance = rpl_get_instance(instance_id); if(instance != NULL) { for(i = 0; i < RPL_MAX_DAG_PER_INSTANCE; ++i) { diff --git a/net/ip/contiki/rpl/rpl.h b/net/ip/contiki/rpl/rpl.h index 89270c3877f..cb4fbc6abdd 100644 --- a/net/ip/contiki/rpl/rpl.h +++ b/net/ip/contiki/rpl/rpl.h @@ -240,6 +240,7 @@ struct rpl_instance { void rpl_init(void); void uip_rpl_input(void); rpl_dag_t *rpl_set_root(struct net_buf *buf, uint8_t instance_id, uip_ipaddr_t *dag_id); +rpl_dag_t *rpl_set_root_with_version(struct net_buf *buf, uint8_t instance_id, uip_ipaddr_t *dag_id, uint8_t version); int rpl_set_prefix(rpl_dag_t *dag, uip_ipaddr_t *prefix, unsigned len); int rpl_repair_root(struct net_buf *buf, uint8_t instance_id); int rpl_set_default_route(rpl_instance_t *instance, uip_ipaddr_t *from);