Always pass the FCS length to dissect_802_3() and ethertype(), so it

will process the FCS if it's known to be present and will attempt to
guess whether it's present if it's not known not to be present.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38990 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 2 insertions, 2 deletions

diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 09dfdb9a5e..420182279a 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -474,10 +474,10 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
       }
 
       dissect_802_3(ehdr->type, is_802_2, tvb, offset, pinfo, parent_tree, fh_tree,
-                    hf_eth_len, hf_eth_trailer, 0);
+                    hf_eth_len, hf_eth_trailer, fcs_len);
     } else {
       ethertype(ehdr->type, tvb, offset, pinfo, parent_tree, fh_tree,
-                         hf_eth_type, hf_eth_trailer, 0);
+                         hf_eth_type, hf_eth_trailer, fcs_len);
     }
   }
 }