summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-03-01 07:39:54 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-03-01 07:39:54 +0000
commit23ec82fae9404694b90dc2ce0d1a9a65fe0f6b8c (patch)
treee5facadf7bae2b469cb7ee6ddc8af96741dd97f5 /epan
parentb28516dc00dbe70de6bc0e653b4d8ae137cfe05a (diff)
downloadwireshark-23ec82fae9404694b90dc2ce0d1a9a65fe0f6b8c.tar.gz
From Reinhard Speyerer: Adding support for LINKTYPE_PPP_ETHER/DLT_PPP_ETHER
svn path=/trunk/; revision=41256
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-pppoe.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index 22edaa90b0..fe5ca8acfb 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -1289,6 +1289,7 @@ void proto_reg_handoff_pppoes(void)
dissector_handle_t pppoes_handle =
create_dissector_handle(dissect_pppoes, proto_pppoes);
dissector_add_uint("ethertype", ETHERTYPE_PPPOES, pppoes_handle);
+ dissector_add_uint("wtap_encap", WTAP_ENCAP_PPP_ETHER, pppoes_handle);
/* Get a handle for the PPP dissector */
ppp_handle = find_dissector("ppp");