Fixed broken neighbor purge from list

List re ordering was broken and now re-order works like it should.
Neighbor link role is defined that now bigger role ID have bigger priority.

Change-Id: I901169a4c7b8e965982fe9420db54d86aaf268f6

Author: Juha Heiskanen

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c

@@ -1328,31 +1328,16 @@ static uint8_t protocol_6lowpan_mle_order_last_entries(int8_t interface_id, mac_
                 continue;
             }
 
-
-
-            // Primary parent (parent selected for bootstrap or RPL primary parent)
-            if (entry->link_role ==  PRIORITY_PARENT_NEIGHBOUR && last->link_role !=  PRIORITY_PARENT_NEIGHBOUR) {
-                continue;
-            }
-
-            // Secondary parent (RPL secondary parent)
-            if (entry->link_role == SECONDARY_PARENT_NEIGHBOUR && last->link_role != SECONDARY_PARENT_NEIGHBOUR) {
-                continue;
-            }
-
-            // Uses this node as parent
-            if (entry->link_role == CHILD_NEIGHBOUR && last->link_role != CHILD_NEIGHBOUR) {
-                continue;
-            }
-
-            // Better ETX
-            etx_cur = etx_storage_entry_get(interface_id, entry->index);
-            etx_last = etx_storage_entry_get(interface_id, last->index);
-
-            if (etx_cur && etx_last && etx_cur->etx <= etx_last->etx) {
+            if (entry->link_role > last->link_role) { //Bigger link role is allways better
                 continue;
+            } else if (entry->link_role == last->link_role) {
+                // Compare ETX when Link role is same
+                etx_cur = etx_storage_entry_get(interface_id, entry->index);
+                etx_last = etx_storage_entry_get(interface_id, last->index);
+                if (etx_cur && etx_last && etx_cur->etx <= etx_last->etx) {
+                    continue;
+                }
             }
-
             last = entry;
         }
 

source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h

@@ -26,9 +26,9 @@
 #define ACTIVE_NUD_PROCESS_MAX 3 //Limit That how many activate NUD process is active in same time
 
 #define NORMAL_NEIGHBOUR                0
-#define PRIORITY_PARENT_NEIGHBOUR       1
-#define SECONDARY_PARENT_NEIGHBOUR      2
-#define CHILD_NEIGHBOUR                 3
+#define SECONDARY_PARENT_NEIGHBOUR      1
+#define CHILD_NEIGHBOUR                 2
+#define PRIORITY_PARENT_NEIGHBOUR       3
 /**
  * Generic Neighbor table entry
  */