deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

style fixes, cherry-pick this and fixup with ae87790

Browse source
This commit is contained in:
Adam Dunkels 2014-12-10 09:07:20 +01:00 committed by Joakim Eriksson
parent 5be43c6f8d
commit fc4a83085a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/net/rpl/rpl-dag.c
View file

@ -83,7 +83,8 @@ rpl_instance_t *default_instance;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uip_ds6_nbr_t * uip_ds6_nbr_t *
rpl_get_nbr(rpl_parent_t *parent) { rpl_get_nbr(rpl_parent_t *parent)
{
linkaddr_t *lladdr = NULL; linkaddr_t *lladdr = NULL;
lladdr = nbr_table_get_lladdr(rpl_parents, parent); lladdr = nbr_table_get_lladdr(rpl_parents, parent);
if(lladdr != NULL) { if(lladdr != NULL) {
@ -93,9 +94,7 @@ rpl_get_nbr(rpl_parent_t *parent) {
return NULL; return NULL;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
nbr_callback(void *ptr) nbr_callback(void *ptr)
{ {

3
core/net/rpl/rpl-mrhof.c
View file

@ -127,9 +127,10 @@ neighbor_link_callback(rpl_parent_t *p, int status, int numtx)
nbr = rpl_get_nbr(p); nbr = rpl_get_nbr(p);
if(nbr == NULL) { if(nbr == NULL) {
/* No neighbor for this parent - something bad has occured!??? */ /* No neighbor for this parent - something bad has occured */
return; return;
} }
recorded_etx = nbr->link_metric; recorded_etx = nbr->link_metric;
/* Do not penalize the ETX when collisions or transmission errors occur. */ /* Do not penalize the ETX when collisions or transmission errors occur. */