Get rid of an unused file type. If somebody wants it in the official

[obnox/wireshark/wip.git] / wiretap / wtap.h

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 78506e6d6e43962b8d59174a291bc4295431f255..d6efbaa37c635604b48dc568a555f38d6ac784be 100644 (file)
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -194,39 +194,38 @@ extern "C" {
 #define WTAP_ENCAP_BLUETOOTH_HCI                102 /*raw packets without a transport layer header e.g. H4*/
 #define WTAP_ENCAP_IPMB                         103
 #define WTAP_ENCAP_IEEE802_15_4                 104
-#define WTAP_ENCAP_X2E_XORAYA                   105
-#define WTAP_ENCAP_FLEXRAY                      106
-#define WTAP_ENCAP_LIN                          107
-#define WTAP_ENCAP_MOST                         108
-#define WTAP_ENCAP_CAN20B                       109
-#define WTAP_ENCAP_LAYER1_EVENT                 110
-#define WTAP_ENCAP_X2E_SERIAL                   111
-#define WTAP_ENCAP_I2C                          112
-#define WTAP_ENCAP_IEEE802_15_4_NONASK_PHY      113
-#define WTAP_ENCAP_TNEF                         114
-#define WTAP_ENCAP_USB_LINUX_MMAPPED            115
-#define WTAP_ENCAP_GSM_UM                       116
-#define WTAP_ENCAP_DPNSS                        117
-#define WTAP_ENCAP_PACKETLOGGER                 118
-#define WTAP_ENCAP_NSTRACE_1_0                  119
-#define WTAP_ENCAP_NSTRACE_2_0                  120
-#define WTAP_ENCAP_FIBRE_CHANNEL_FC2            121
-#define WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS 122
-#define WTAP_ENCAP_JPEG_JFIF                    123    /* obsoleted by WTAP_ENCAP_MIME*/
-#define WTAP_ENCAP_IPNET                        124
-#define WTAP_ENCAP_SOCKETCAN                    125
-#define WTAP_ENCAP_IEEE802_11_NETMON_RADIO      126
-#define WTAP_ENCAP_IEEE802_15_4_NOFCS           127
-#define WTAP_ENCAP_RAW_IPFIX                    128
-#define WTAP_ENCAP_RAW_IP4                      129
-#define WTAP_ENCAP_RAW_IP6                      130
-#define WTAP_ENCAP_LAPD                         131
-#define WTAP_ENCAP_DVBCI                        132
-#define WTAP_ENCAP_MUX27010                     133
-#define WTAP_ENCAP_MIME                         134
-#define WTAP_ENCAP_NETANALYZER                  135
-#define WTAP_ENCAP_NETANALYZER_TRANSPARENT      136
-#define WTAP_ENCAP_IP_OVER_IB                   137
+#define WTAP_ENCAP_FLEXRAY                      105
+#define WTAP_ENCAP_LIN                          106
+#define WTAP_ENCAP_MOST                         107
+#define WTAP_ENCAP_CAN20B                       108
+#define WTAP_ENCAP_LAYER1_EVENT                 109
+#define WTAP_ENCAP_X2E_SERIAL                   110
+#define WTAP_ENCAP_I2C                          111
+#define WTAP_ENCAP_IEEE802_15_4_NONASK_PHY      112
+#define WTAP_ENCAP_TNEF                         113
+#define WTAP_ENCAP_USB_LINUX_MMAPPED            114
+#define WTAP_ENCAP_GSM_UM                       115
+#define WTAP_ENCAP_DPNSS                        116
+#define WTAP_ENCAP_PACKETLOGGER                 117
+#define WTAP_ENCAP_NSTRACE_1_0                  118
+#define WTAP_ENCAP_NSTRACE_2_0                  119
+#define WTAP_ENCAP_FIBRE_CHANNEL_FC2            120
+#define WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS 121
+#define WTAP_ENCAP_JPEG_JFIF                    122    /* obsoleted by WTAP_ENCAP_MIME*/
+#define WTAP_ENCAP_IPNET                        123
+#define WTAP_ENCAP_SOCKETCAN                    124
+#define WTAP_ENCAP_IEEE802_11_NETMON_RADIO      125
+#define WTAP_ENCAP_IEEE802_15_4_NOFCS           126
+#define WTAP_ENCAP_RAW_IPFIX                    127
+#define WTAP_ENCAP_RAW_IP4                      128
+#define WTAP_ENCAP_RAW_IP6                      129
+#define WTAP_ENCAP_LAPD                         130
+#define WTAP_ENCAP_DVBCI                        131
+#define WTAP_ENCAP_MUX27010                     132
+#define WTAP_ENCAP_MIME                         133
+#define WTAP_ENCAP_NETANALYZER                  134
+#define WTAP_ENCAP_NETANALYZER_TRANSPARENT      135
+#define WTAP_ENCAP_IP_OVER_IB                   136
 
 #define WTAP_NUM_ENCAP_TYPES                    wtap_get_num_encap_types()