From 2858871aacd13120cedc9ef93474d06a50a79cff Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Mon, 29 Feb 2016 23:06:38 +0100 Subject: FC: Forget about MDS when dealing with ETHERTYPE_BRDWALK (CID 280012) Since the MDS trailer is smaller anyway, no need to copy that code. Change-Id: Ie3931cda3ef2386526cd81daee535d106e522875 Reviewed-on: https://code.wireshark.org/review/14253 Reviewed-by: Alexis La Goutte --- epan/dissectors/packet-fc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 45288d8bd8..277c739652 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1046,9 +1046,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean } frag_size -= MDSHDR_TRAILER_SIZE; } else if (fc_data->ethertype == ETHERTYPE_BRDWALK) { - if ((frag_size <= 8) || - ((frag_size == MDSHDR_TRAILER_SIZE) && (ftype != FC_FTYPE_LINKCTL) && - (ftype != FC_FTYPE_BLS) && (ftype != FC_FTYPE_OHMS))) { + if (frag_size <= 8) { proto_tree_add_expert(fc_tree, pinfo, &ei_short_hdr, tvb, FC_HEADER_SIZE, frag_size); return; -- cgit v1.2.3