fixup! gnrc_ipv6: iface might be from input on next hop determination

RIOT-OS · Sep 22, 2015 · 04878de · 04878de
1 parent aefb74f
commit 04878de
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
@@ -534,17 +534,14 @@ static inline kernel_pid_t _next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len
 #if defined(MODULE_GNRC_SIXLOWPAN_ND)
     (void)pkt;
     found_iface = gnrc_sixlowpan_nd_next_hop_l2addr(l2addr, l2addr_len, iface, dst);
-    if (found_iface <= KERNEL_PID_UNDEF) {
+    if (found_iface > KERNEL_PID_UNDEF) {
         return found_iface;
     }
-#else
-    found_iface = KERNEL_PID_UNDEF;
 #endif
 #if defined(MODULE_GNRC_NDP_NODE)
-    if (found_iface <= KERNEL_PID_UNDEF) {
-        found_iface = gnrc_ndp_node_next_hop_l2addr(l2addr, l2addr_len, iface, dst, pkt);
-    }
+    found_iface = gnrc_ndp_node_next_hop_l2addr(l2addr, l2addr_len, iface, dst, pkt);
 #elif !defined(MODULE_GNRC_SIXLOWPAN_ND)
+    found_iface = KERNEL_PID_UNDEF;
     (void)l2addr;
     (void)l2addr_len;
     (void)iface;