diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2010-11-10 22:37:30 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2010-11-10 22:37:30 +0000 |
| commit | b18e8fd1ca1b9dbc0aaf7aaef112591cd7b0e32e (patch) | |
| tree | 5b012b0a5532b2538f63a624c8a2b52b74e21ead /epan/dissectors/packet-ethertype.c | |
| parent | 31f5ce6193896c313a8d507798ad7eedda3bc30c (diff) | |
Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II.
svn path=/trunk/; revision=34838
Diffstat (limited to 'epan/dissectors/packet-ethertype.c')
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index cb74edcfaa..a29e00bef7 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -37,7 +37,6 @@ #include "packet-ip.h" #include "packet-ipv6.h" #include "packet-ipx.h" -#include "packet-vlan.h" #include "packet-ieee8021ah.h" #include "packet-vines.h" #include <epan/etypes.h> @@ -186,7 +185,7 @@ capture_ethertype(guint16 etype, const guchar *pd, int offset, int len, capture_ipx(ld); break; case ETHERTYPE_VLAN: - capture_vlan(pd, offset, len, ld); + capture_eth(pd, offset, len, ld); break; case ETHERTYPE_IEEE_802_1AD: case ETHERTYPE_IEEE_802_1AH: |