aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-eth.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2010-11-20 18:14:30 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2010-11-20 18:14:30 +0000
commitba2d64102c32e1087bb5a38c1749ca738dc58c1f (patch)
tree7735eef3874f19b23dce47d5731827f96e73caf5 /epan/dissectors/packet-eth.c
parentd8462d9e0c68ce023ecd599a615bec1efdc11d3d (diff)
Fix for bug 5422:
Add support for dissecting SLL type 0x03 frames. svn path=/trunk/; revision=34987
Diffstat (limited to 'epan/dissectors/packet-eth.c')
-rw-r--r--epan/dissectors/packet-eth.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 3a4d31ec52..2f35619dbf 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -36,6 +36,7 @@
#include "packet-ipx.h"
#include "packet-isl.h"
#include "packet-llc.h"
+#include "packet-sll.h"
#include <epan/crc32.h>
#include <epan/tap.h>
#include <epan/expert.h>
@@ -755,6 +756,8 @@ proto_reg_handoff_eth(void)
dissector_add("chdlctype", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
dissector_add("gre.proto", ETHERTYPE_ETHBRIDGE, eth_withoutfcs_handle);
+ dissector_add("sll.ltype", LINUX_SLL_P_ETHERNET, eth_withoutfcs_handle);
+
/*
* This is to handle the output for the Cisco CMTS "cable intercept"
* command - it encapsulates Ethernet frames in UDP packets, but