riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11255 from aabadie/pr/gnrc_netif_nrfmin_fix

Browse Source 
net/gnrc_netif/nrfmin: put NETOPT_PROTO assert at the right place
This commit is contained in:
Martine Lenders 2019-03-24 15:01:50 +01:00 committed by GitHub
commit bcb6b921d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -1212,12 +1212,12 @@ static void _test_options(gnrc_netif_t *netif)
assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR); assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR);
assert((IEEE802154_SHORT_ADDRESS_LEN == netif->l2addr_len) || assert((IEEE802154_SHORT_ADDRESS_LEN == netif->l2addr_len) ||
(IEEE802154_LONG_ADDRESS_LEN == netif->l2addr_len)); (IEEE802154_LONG_ADDRESS_LEN == netif->l2addr_len));
assert(-ENOTSUP != netif->dev->driver->get(netif->dev, NETOPT_PROTO,
&tmp, sizeof(tmp)));
#ifdef MODULE_GNRC_IPV6 #ifdef MODULE_GNRC_IPV6
#ifdef MODULE_GNRC_SIXLOWPAN #ifdef MODULE_GNRC_SIXLOWPAN
assert(netif->ipv6.mtu == IPV6_MIN_MTU); assert(netif->ipv6.mtu == IPV6_MIN_MTU);
assert(netif->sixlo.max_frag_size > 0); assert(netif->sixlo.max_frag_size > 0);
assert(-ENOTSUP != netif->dev->driver->get(netif->dev, NETOPT_PROTO,
&tmp, sizeof(tmp)));
#else /* MODULE_GNRC_SIXLOWPAN */ #else /* MODULE_GNRC_SIXLOWPAN */
assert(netif->ipv6.mtu < UINT16_MAX); assert(netif->ipv6.mtu < UINT16_MAX);
#endif /* MODULE_GNRC_SIXLOWPAN */ #endif /* MODULE_GNRC_SIXLOWPAN */