From abb3ef9b3b849521e268252f1b3e45cd9ceebc2c Mon Sep 17 00:00:00 2001
From: Adam Dunkels <adam@thingsquare.com>
Date: Mon, 12 Aug 2013 00:01:07 +0200
Subject: [PATCH] Bugfix: don't set the parent if the dag is NULL

---
 core/net/rpl/rpl-dag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index f2ea37806..5719c811f 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -135,8 +135,8 @@ rpl_set_preferred_parent(rpl_dag_t *dag, rpl_parent_t *p)
      * neighbor table. */
     nbr_table_unlock(rpl_parents, dag->preferred_parent);
     nbr_table_lock(rpl_parents, p);
+    dag->preferred_parent = p;
   }
-  dag->preferred_parent = p;
 }
 /*---------------------------------------------------------------------------*/
 /* Greater-than function for the lollipop counter.                      */