diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-08-25 14:14:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-08-25 21:14:48 +0000 |
| commit | c8157aa6b4afdbc2f84779ffbeea4f8d3bdc8666 (patch) | |
| tree | cec6da41eb0360dab67a9b9e7234db95975ad854 /wiretap/wtap.h | |
| parent | ce9a4b212ec7b75985cef3b9ab362808e6fd25c5 (diff) | |
| download | wireshark-c8157aa6b4afdbc2f84779ffbeea4f8d3bdc8666.tar.gz | |
Go back to having only one SocketCAN LINKTYPE_ value.
Libpcap just backed out the "host-endian" SocketCAN LINKTYPE_ value; we
don't need it any more.
Change-Id: I33a7dc21207a0009e20b4abaefe1119eb649c39a
Reviewed-on: https://code.wireshark.org/review/17327
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.h')
| -rw-r--r-- | wiretap/wtap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index fc73ebe5c9..20a3b188f3 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -212,7 +212,7 @@ extern "C" { #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_BIGENDIAN 125 +#define WTAP_ENCAP_SOCKETCAN 125 #define WTAP_ENCAP_IEEE_802_11_NETMON 126 #define WTAP_ENCAP_IEEE802_15_4_NOFCS 127 #define WTAP_ENCAP_RAW_IPFIX 128 @@ -269,7 +269,6 @@ extern "C" { #define WTAP_ENCAP_GFP_F 179 #define WTAP_ENCAP_IP_OVER_IB_PCAP 180 #define WTAP_ENCAP_JUNIPER_VN 181 -#define WTAP_ENCAP_SOCKETCAN_HOSTENDIAN 182 /* After adding new item here, please also add new item to encap_table_base array */ #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |