Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop

os/net/routing/rpl-classic/rpl.c

@@ -270,9 +270,11 @@ rpl_link_callback(const linkaddr_t *addr, int status, int numtx)
       if(parent != NULL) {
         /* If this is the neighbor we were probing urgently, mark urgent
         probing as done */
+#if RPL_WITH_PROBING
         if(instance->urgent_probing_target == parent) {
           instance->urgent_probing_target = NULL;
         }
+#endif /* RPL_WITH_PROBING */
         /* Trigger DAG rank recalculation. */
         LOG_DBG("rpl_link_callback triggering update\n");
         parent->flags |= RPL_PARENT_FLAG_UPDATED;