diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 28eaf37470..df6a4a3904 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -255,8 +255,7 @@ static gint hf_cf_flags = -1; static gint hf_cf_flags2 = -1; static gint hf_flow_type = -1; static gint hf_ha_unit = -1; -static gint hf_ingress_slot = -1; -static gint hf_ingress_port = -1; +static gint hf_reserved = -1; static gint hf_priority = -1; static gint hf_rstcause = -1; static gint hf_rstcause_len = -1; @@ -1873,18 +1872,8 @@ dissect_med_trailer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gui proto_tree_add_item(tree, hf_ha_unit, tvb, o, 1, ENC_BIG_ENDIAN); o += 1; - if (trailer_ver == 0 && (trailer_length == F5_MEDV94_LEN || trailer_length == F5_MEDV10_LEN)) { - proto_tree_add_item(tree, hf_ingress_slot, tvb, o, 2, ENC_LITTLE_ENDIAN); - o += 2; - proto_tree_add_item(tree, hf_ingress_port, tvb, o, 2, ENC_LITTLE_ENDIAN); - o += 2; - } else { - /* V11 fixed the byte order of these */ - proto_tree_add_item(tree, hf_ingress_slot, tvb, o, 2, ENC_BIG_ENDIAN); - o += 2; - proto_tree_add_item(tree, hf_ingress_port, tvb, o, 2, ENC_BIG_ENDIAN); - o += 2; - } + proto_tree_add_item(tree, hf_reserved, tvb, o, 4, ENC_BIG_ENDIAN); + o += 4; if (trailer_ver >= 2) { proto_tree_add_item(tree, hf_priority, tvb, o, 1, ENC_BIG_ENDIAN); o += 1; @@ -2325,10 +2314,8 @@ dissect_dpt_trailer_noise_med(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree_add_item(tree, hf_ha_unit, tvb, o, 1, ENC_BIG_ENDIAN); o += 1; - proto_tree_add_item(tree, hf_ingress_slot, tvb, o, 2, ENC_BIG_ENDIAN); - o += 2; - proto_tree_add_item(tree, hf_ingress_port, tvb, o, 2, ENC_BIG_ENDIAN); - o += 2; + proto_tree_add_item(tree, hf_reserved, tvb, o, 4, ENC_BIG_ENDIAN); + o += 4; proto_tree_add_item(tree, hf_priority, tvb, o, 1, ENC_BIG_ENDIAN); o += 1; if (badrstcauselen) { @@ -3788,12 +3775,8 @@ proto_register_f5ethtrailer(void) { "HA Unit", "f5ethtrailer.haunit", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, - { &hf_ingress_slot, - { "Ingress Slot", "f5ethtrailer.ingressslot", FT_UINT16, BASE_DEC, NULL, - 0x0, NULL, HFILL } - }, - { &hf_ingress_port, - { "Ingress Port", "f5ethtrailer.ingressport", FT_UINT16, BASE_DEC, NULL, + { &hf_reserved, + { "Reserved", "f5ethtrailer.reserved", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_priority,