aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-canopen.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2017-05-06 11:35:23 +0200
committerMichael Mann <mmann78@netscape.net>2017-05-06 15:56:40 +0000
commit753d6f66679430a61af87e7f77d14950bb2f726e (patch)
treedd000cdcc3e74bfe97ac4d3c495fc7bad35f6161 /epan/dissectors/packet-canopen.c
parent6364e44fb0de823a6c55225bf52f5daf54f70097 (diff)
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-canopen.c')
-rw-r--r--epan/dissectors/packet-canopen.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c
index 1f08d1be47..e735984b2e 100644
--- a/epan/dissectors/packet-canopen.c
+++ b/epan/dissectors/packet-canopen.c
@@ -25,6 +25,8 @@
#include <epan/packet.h>
+#include "packet-socketcan.h"
+
void proto_register_canopen(void);
void proto_reg_handoff_canopen(void);
@@ -726,12 +728,6 @@ canopen_detect_msg_type(guint function_code, guint node_id)
}
}
-struct can_identifier
-{
- guint32 id;
-};
-
-
static void
dissect_sdo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *canopen_type_tree, guint function_code)
{