Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

This commit is contained in:
Adam Dunkels 2011-09-05 11:46:31 +02:00
commit 4ab042eb9f

View file

@ -144,7 +144,7 @@ should_send_dao(rpl_dag_t *dag, rpl_dio_t *dio, rpl_parent_t *p)
{ {
/* if MOP is set to no downward routes no DAO should be sent */ /* if MOP is set to no downward routes no DAO should be sent */
if(dag->mop == RPL_MOP_NO_DOWNWARD_ROUTES) return 0; if(dag->mop == RPL_MOP_NO_DOWNWARD_ROUTES) return 0;
return dio->dtsn > p->dtsn && p == dag->preferred_parent; return dio->dtsn != p->dtsn && p == dag->preferred_parent;
} }
/************************************************************************/ /************************************************************************/
static int static int