aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-12-03 15:47:52 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-12-03 15:47:52 +0000
commit11ba06366d3a8cf6d4e3af6f969fb103489cc413 (patch)
treee132da67e50bd7775bce6a57d4cdced27fa2f9e4 /wiretap
parentfcee7ad2dfd3cb3a414ceee3703433813b50365b (diff)
Renamed some wtap defines:
WTAP_GCOM_TIE1 => WTAP_ENCAP_GCOM_TIE1 WTAP_GCOM_SERIAL => WTAP_ENCAP_GCOM_SERIAL svn path=/trunk/; revision=31161
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/pcap-common.c4
-rw-r--r--wiretap/wtap.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 235bc6d802..23c060a02f 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -295,8 +295,8 @@ static const struct {
*/
/* Registered by Gcom, Inc. */
- { 172, WTAP_GCOM_TIE1 },
- { 173, WTAP_GCOM_SERIAL },
+ { 172, WTAP_ENCAP_GCOM_TIE1 },
+ { 173, WTAP_ENCAP_GCOM_SERIAL },
{ 177, WTAP_ENCAP_LINUX_LAPD },
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index c0bb2687ce..6f6d7158fd 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -166,8 +166,8 @@ extern "C" {
#define WTAP_ENCAP_NETTL_UNKNOWN 74
#define WTAP_ENCAP_MTP2_WITH_PHDR 75
#define WTAP_ENCAP_JUNIPER_PPPOE 76
-#define WTAP_GCOM_TIE1 77
-#define WTAP_GCOM_SERIAL 78
+#define WTAP_ENCAP_GCOM_TIE1 77
+#define WTAP_ENCAP_GCOM_SERIAL 78
#define WTAP_ENCAP_NETTL_X25 79
#define WTAP_ENCAP_K12 80
#define WTAP_ENCAP_JUNIPER_MLPPP 81