From ac028d199f9ac3c87fe998feea52e6a42cdc013c Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Sun, 17 Apr 2016 14:06:41 +0200 Subject: [PATCH 1/2] Revert "doc: mandatory netif snip for gnrc_ipv6 receive()" This reverts commit f15e038efe668387a368082c0f42d2648896d851. --- sys/include/net/gnrc/ipv6.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/include/net/gnrc/ipv6.h b/sys/include/net/gnrc/ipv6.h index 03b89cb8aa66..deb8536f3703 100644 --- a/sys/include/net/gnrc/ipv6.h +++ b/sys/include/net/gnrc/ipv6.h @@ -14,10 +14,7 @@ * The IPv6 control thread understands messages of type * * * @ref GNRC_NETAPI_MSG_TYPE_RCV, and - * * @ref GNRC_NETAPI_MSG_TYPE_SND. - * - * If the message is of type @ref GNRC_NETAPI_MSG_TYPE_RCV the provided @ref - * gnrc_pktsnip_t must contain a snip of type @ref GNRC_NETTYPE_NETIF. + * * @ref GNRC_NETAPI_MSG_TYPE_SND, * * @{ * From 4bcbb6e1e0f970c90cace4c26bca8625bf1ee267 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Sun, 17 Apr 2016 14:06:54 +0200 Subject: [PATCH 2/2] Revert "gnrc ipv6: replace check by assert" This reverts commit 856e1ee0d246ec099df4d81164c9b9fde88a52d1. --- sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c index d608dcd3e869..eee0ac8c17f0 100644 --- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c +++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c @@ -769,8 +769,9 @@ static void _receive(gnrc_pktsnip_t *pkt) netif = gnrc_pktsnip_search_type(pkt, GNRC_NETTYPE_NETIF); - assert(netif); - iface = ((gnrc_netif_hdr_t *)netif->data)->if_pid; + if (netif != NULL) { + iface = ((gnrc_netif_hdr_t *)netif->data)->if_pid; + } first_ext = pkt;