summaryrefslogtreecommitdiff
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-03-05 20:30:03 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-03-05 20:30:03 +0000
commitf9ad87dd7c979e6cf3f511ca49ef815026cb2217 (patch)
tree22467d8719f12b2bec0aa346acfed888ac73eadd /wiretap/wtap.c
parent3b5f1bce7b33f5451bd67aa870164fefa6751824 (diff)
downloadwireshark-f9ad87dd7c979e6cf3f511ca49ef815026cb2217.tar.gz
From Owen Kirby :
IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 9ec246cd0c..358ca3480a 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -400,7 +400,10 @@ static struct encap_type_info encap_table_base[] = {
{ "Bluetooth without transport layer", "bluetooth-hci" },
/* WTAP_ENCAP_IPMB */
- { "Intelligent Platform Management Bus", "ipmb" }
+ { "Intelligent Platform Management Bus", "ipmb" },
+
+ /* WTAP_ENCAP_IEEE802_15_4 */
+ { "IEEE 802.15.4 Wireless PAN", "wpan" }
};
gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);