diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2020-03-12 18:33:24 +0100 |
|---|---|---|
| committer | Andre Hartmann <aha_1980@gmx.de> | 2020-03-19 20:16:26 +0100 |
| commit | 16817cba8720797f20c6d8e638614356d909529b (patch) | |
| tree | b9152a29d15b761d25a8f989b259d1d282f594ba /src/plugins/canbus/socketcan/socketcanbackend.cpp | |
| parent | 3653815f3cd12291790180456fe18df9e95f82ab (diff) | |
SocketCAN: Fix compile with old Linux Kernels
qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h:91:5:
error: ‘canfd_frame’ does not name a type
That was already fixed earlier in 96d291cb,
but broken again by e23f4ced.
Fixes: QTBUG-82814
Change-Id: I8bfc4168165cf8e266b89e8327f88f862cf1b348
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/socketcan/socketcanbackend.cpp')
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index e38e187..d91c4fc 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -56,30 +56,6 @@ #include <sys/ioctl.h> #include <sys/time.h> -#ifndef CANFD_MTU -// CAN FD support was added by Linux kernel 3.6 -// For prior kernels we redefine the missing defines here -// they are taken from linux/can/raw.h & linux/can.h - -enum { - CAN_RAW_FD_FRAMES = 5 -}; - -#define CAN_MAX_DLEN 8 -#define CANFD_MAX_DLEN 64 -struct canfd_frame { - canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ - __u8 len; /* frame payload length in byte */ - __u8 flags; /* additional flags for CAN FD */ - __u8 __res0; /* reserved / padding */ - __u8 __res1; /* reserved / padding */ - __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); -}; -#define CAN_MTU (sizeof(struct can_frame)) -#define CANFD_MTU (sizeof(struct canfd_frame)) - -#endif - #ifndef CANFD_BRS # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ #endif |