From d6fedc1e6e33bf06861481bfebae7c1e9bc43325 Mon Sep 17 00:00:00 2001
From: David Wragg <david@wragg.org>
Date: Tue, 23 Jun 2015 14:49:52 +0100
Subject: [PATCH] Remove error return value from DecodeLayers

It is never checked, so add a comment explaining why.
---
 router/ethernet_decoder.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/router/ethernet_decoder.go b/router/ethernet_decoder.go
index 036840c8..fc96a14b 100644
--- a/router/ethernet_decoder.go
+++ b/router/ethernet_decoder.go
@@ -22,8 +22,12 @@ func NewEthernetDecoder() *EthernetDecoder {
 	return dec
 }
 
-func (dec *EthernetDecoder) DecodeLayers(data []byte) error {
-	return dec.parser.DecodeLayers(data, &dec.decoded)
+func (dec *EthernetDecoder) DecodeLayers(data []byte) {
+	// We intentionally discard the error return here, because it
+	// is normal for gopacket to return an error saying that it
+	// cannot decode a layer beyond the ones we specified when
+	// setting up the parser.
+	dec.parser.DecodeLayers(data, &dec.decoded)
 }
 
 func (dec *EthernetDecoder) sendICMPFragNeeded(mtu int, sendFrame func([]byte) error) error {