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

Merge pull request #5326 from authmillenon/gnrc_ipv6/fix/revert5179

Browse Source 
gnrc_ipv6: Revert #5179
This commit is contained in:
Hauke Petersen 2016-04-20 14:34:07 +02:00
commit 4ace70199e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/include/net/gnrc/ipv6.h
View File

@ -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,
*
* @{
*

5
sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
View File

@ -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;