diff options
Diffstat (limited to 'epan/dissectors/packet-pw-eth.c')
| -rw-r--r-- | epan/dissectors/packet-pw-eth.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index 8ad4cab5a8..87906b22f9 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.c @@ -87,23 +87,7 @@ dissect_pw_eth_cw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb = tvb_new_subset_remaining(tvb, 4); { - /* - * When Ethernet frames being decoded, pinfo->ethertype is extracted - * from the top-level Ethernet frame. Dissection of Ethernet PW payload - * overwrites this value as the same dissector is invoked again. - * This may lead to undesired behavior (like disappearance of "Link" - * tab from the "Decode as" menu). - * - * Let's save/restore ethertype. --ATA - * - * XXX it looks that more pinfo members (or even the whole pinfo) - * XXX should be saved/restored in PW cases. Multilayer encapsulations, - * XXX like ethernet/mpls/ethernet-pw/ip/vlan, may lead to undesired - * XXX changes if pinfo->ipproto, ptype etc. - */ - guint32 etype_save = pinfo->ethertype; call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree); - pinfo->ethertype = etype_save; } } @@ -120,9 +104,7 @@ dissect_pw_eth_nocw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb = tvb_new_subset_remaining(tvb, 0); { - guint32 etype_save = pinfo->ethertype; call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree); - pinfo->ethertype = etype_save; } } |