From Robert Bullen: give the Bluetooth-H4-with-Linux-pseudo-header

encapsulation a name different from the no-pseudo-header H4
encapsulation.

svn path=/trunk/; revision=32321

diff --git a/AUTHORS b/AUTHORS
index 86390f3abcbebe9559901b202dd096464d713067..2906e4e47b0088cc65a7bb2f6441e6ab34693631 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -3174,6 +3174,7 @@ Johanna Sochos            <johanna.sochos [AT] swissqual.com>
 Felix Obenhuber                <felix [AT] obenhuber.de>
 Hilko Bengen           <bengen--wireshark [AT] hilluzination.de>
 Hadar Shoham           <hadar [AT] ti.com>
+Robert Bullen          <robert [AT] bitcricket.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 55f7dee547bd8cab04ccf9d4c2fcd8cbefc7fa04..a1d76d7cd06d9b2ac695d300019ce3902138c1d2 100644 (file)
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -388,7 +388,7 @@ static struct encap_type_info encap_table_base[] = {
        { "Endace Record File", "erf" },
 
        /* WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR */
-       { "Bluetooth H4 with linux header", "bluetooth-h4" },
+       { "Bluetooth H4 with linux header", "bluetooth-h4-linux" },
 
        /* WTAP_ENCAP_SITA */
        { "SITA WAN packets", "sita-wan" },