From 4bda0f6f54b4a44e2b2208e33b14b70de88b44a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Thu, 28 May 2015 18:20:32 +0200
Subject: [PATCH] ng_netdev_eth: default to NG_ETHERTYPE_UNKNOWN when no
 payload avail.

---
 sys/net/link_layer/ng_netdev_eth/ng_netdev_eth.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys/net/link_layer/ng_netdev_eth/ng_netdev_eth.c b/sys/net/link_layer/ng_netdev_eth/ng_netdev_eth.c
index 700270169d..322c351a01 100644
--- a/sys/net/link_layer/ng_netdev_eth/ng_netdev_eth.c
+++ b/sys/net/link_layer/ng_netdev_eth/ng_netdev_eth.c
@@ -373,7 +373,12 @@ static int _marshall_ethernet(ng_netdev_eth_t *dev, uint8_t *buffer, ng_pktsnip_
         return -EBADMSG;
     }
 
-    hdr->type = byteorder_htons(ng_nettype_to_ethertype(pkt->next->type));
+    if (payload) {
+        hdr->type = byteorder_htons(ng_nettype_to_ethertype(payload->type));
+    }
+    else {
+        hdr->type = byteorder_htons(NG_ETHERTYPE_UNKNOWN);
+    }
 
     netif_hdr = pkt->data;