diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-05-06 11:35:23 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-06 15:56:40 +0000 |
| commit | 753d6f66679430a61af87e7f77d14950bb2f726e (patch) | |
| tree | dd000cdcc3e74bfe97ac4d3c495fc7bad35f6161 /epan/dissectors/packet-socketcan.c | |
| parent | 6364e44fb0de823a6c55225bf52f5daf54f70097 (diff) | |
| download | wireshark-753d6f66679430a61af87e7f77d14950bb2f726e.tar.gz | |
can: remove duplicated can_identifier struct.
Change-Id: Ib6f0bcd1bec9a1fc5cbcd797a1f418270ae74a0e
Reviewed-on: https://code.wireshark.org/review/21537
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-socketcan.c')
| -rw-r--r-- | epan/dissectors/packet-socketcan.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 6d27ac0c9a..ca62cca0a8 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -33,6 +33,7 @@ #include <wiretap/wtap.h> #include "packet-sll.h" +#include "packet-socketcan.h" /* controller area network (CAN) kernel definitions * These masks are usually defined within <linux/can.h> but are not @@ -81,15 +82,6 @@ static gboolean byte_swap = FALSE; #define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ #define CANFD_ESI 0x02 /* error state indicator of the transmitting node */ -/* Structure that gets passed between dissectors. Since it's just a simple 32-bit - value, no sense in creating a header file for it. Just expect subdissectors - to provide their own. - */ -struct can_identifier -{ - guint32 id; -}; - static dissector_table_t subdissector_table; static dissector_handle_t socketcan_bigendian_handle; static dissector_handle_t socketcan_hostendian_handle; |