mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-01-18 12:52:44 +01:00
Merge pull request #3931 from OlegHahm/6lbr_pick_right_next_hop
6lowpan: IPv6 next hop shouldn't supersede 6lo
This commit is contained in:
commit
d1bd2ae0a3
@ -538,7 +538,9 @@ static inline kernel_pid_t _next_hop_l2addr(uint8_t *l2addr, uint8_t *l2addr_len
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if defined(MODULE_GNRC_NDP_NODE)
|
#if defined(MODULE_GNRC_NDP_NODE)
|
||||||
iface = gnrc_ndp_node_next_hop_l2addr(l2addr, l2addr_len, iface, dst, pkt);
|
if (iface <= KERNEL_PID_UNDEF) {
|
||||||
|
iface = gnrc_ndp_node_next_hop_l2addr(l2addr, l2addr_len, iface, dst, pkt);
|
||||||
|
}
|
||||||
#elif !defined(MODULE_GNRC_SIXLOWPAN_ND)
|
#elif !defined(MODULE_GNRC_SIXLOWPAN_ND)
|
||||||
iface = KERNEL_PID_UNDEF;
|
iface = KERNEL_PID_UNDEF;
|
||||||
(void)l2addr;
|
(void)l2addr;
|
||||||
|
Loading…
Reference in New Issue
Block a user