[SQUASH ME] ng_ipv6: fix receive

Conflicts: sys/net/network_layer/ng_ipv6/ng_ipv6.c
RIOT-OS · Mar 25, 2015 · ef6fc20 · ef6fc20
1 parent a052041
commit ef6fc20
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sys/net/network_layer/ng_ipv6/ng_ipv6.c b/sys/net/network_layer/ng_ipv6/ng_ipv6.c
@@ -352,6 +352,7 @@ static void _handle_receive(kernel_pid_t netif, ng_pktsnip_t *pkt)
     if (_pkt_not_for_me(&netif, hdr)) { /* if packet is not for me */
         /* redirect to next hop */
         ng_pktbuf_hold(ipv6, 1);
+        ipv6->next = NULL;
         ng_pktbuf_release(pkt);     /* Drop everything except IPv6 */
         ipv6->next = NULL;
         _handle_send(ipv6, true, false);
@@ -685,6 +686,8 @@ ng_nettype_t ng_ipv6_demux(ng_pktsnip_t *pkt, uint8_t nh)
 
         case NG_PROTNUM_ICMPV6:
             DEBUG("ipv6: Received ICMPv6 packet.\n");
+            pkt->type = NG_NETTYPE_ICMPV6;  /* preset needed for further
+                                             * handling*/
             ng_icmpv6_demux(pkt);
             return NG_NETTYPE_ICMPV6;
 #endif