summaryrefslogtreecommitdiff
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-08-25 14:39:42 -0700
committerGuy Harris <guy@alum.mit.edu>2016-08-25 21:40:14 +0000
commit27372ca7379b3ff5cccf1488d96a72d06dfba0d1 (patch)
treef9c4d1fd46e29ef591b2dea4ed6ed442d91a0698 /wiretap/wtap.c
parentc8157aa6b4afdbc2f84779ffbeea4f8d3bdc8666 (diff)
downloadwireshark-27372ca7379b3ff5cccf1488d96a72d06dfba0d1.tar.gz
One more change for the removal of LINKTYPE_SOCKETCAN_HOSTENDIAN.
Change-Id: If1615e23efa30119fff5eb2935335c2cde34b89e Reviewed-on: https://code.wireshark.org/review/17330 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 213ab867a5..01dfee42d3 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -751,8 +751,8 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_IPNET */
{ "Solaris IPNET", "ipnet" },
- /* WTAP_ENCAP_SOCKETCAN_BIGENDIAN */
- { "SocketCAN with big-endian CAN ID", "socketcan-bigendian" },
+ /* WTAP_ENCAP_SOCKETCAN */
+ { "SocketCAN", "socketcan" },
/* WTAP_ENCAP_IEEE_802_11_NETMON */
{ "IEEE 802.11 plus Network Monitor radio header", "ieee-802-11-netmon" },
@@ -921,9 +921,6 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_JUNIPER_VN */
{ "Juniper VN", "juniper-vn" },
-
- /* WTAP_ENCAP_SOCKETCAN_HOSTENDIAN */
- { "SocketCAN with host-endian CAN ID", "socketcan-hostendian" },
};
WS_DLL_LOCAL