1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #8087 from miri64/gnrc_ipv6_nib/fix/stray-assert

gnrc_ipv6_nib: Remove stray assert() in _handle_aro()
This commit is contained in:
Koen Zandberg 2017-11-20 12:07:58 +01:00 committed by GitHub
commit 460d3c44fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -175,7 +175,6 @@ uint8_t _handle_aro(gnrc_netif_t *netif, const ipv6_hdr_t *ipv6,
#if GNRC_IPV6_NIB_CONF_6LR #if GNRC_IPV6_NIB_CONF_6LR
else if (gnrc_netif_is_6lr(netif) && else if (gnrc_netif_is_6lr(netif) &&
(icmpv6->type == ICMPV6_NBR_SOL)) { (icmpv6->type == ICMPV6_NBR_SOL)) {
assert(nce != NULL);
return _reg_addr_upstream(netif, ipv6, icmpv6, aro, sl2ao, nce); return _reg_addr_upstream(netif, ipv6, icmpv6, aro, sl2ao, nce);
} }
#else /* GNRC_IPV6_NIB_CONF_6LR */ #else /* GNRC_IPV6_NIB_CONF_6LR */