diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-05-05 21:05:06 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-05-05 21:05:06 +0000 |
| commit | 8ae2b160a518d4f767e4e86d769a7e2c7a38ea64 (patch) | |
| tree | ec02be506e5599ff515fe4d0b9142e53396b3974 /epan | |
| parent | 823912c0af41ca9360086eabcb28e91436b4138a (diff) | |
The only callers of ethertype() should be dissectors for protocols with
Ethernet-type trailers; no callers are left that don't at least purport
to care about them.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28284 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 34bbdb8f9c..318ea4a22c 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -1,5 +1,7 @@ /* packet-ethertype.c - * Routines for calling the right protocol for the ethertype. + * Routines for processing Ethernet payloads and payloads like Ethernet + * payloads (i.e., payloads when there could be an Ethernet trailer and + * possibly an FCS). * * $Id$ * @@ -309,9 +311,6 @@ add_dix_trailer(packet_info *pinfo, proto_tree *fh_tree, int trailer_id, if (fh_tree == NULL) return; /* we're not building a protocol tree */ - if (trailer_id == -1) - return; /* our caller doesn't care about trailers */ - /* OK, how much is there in that tvbuff now? */ length = tvb_reported_length(next_tvb); |