diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-10 05:12:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-10 05:12:17 +0300 |
| commit | 43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39 (patch) | |
| tree | ae8fa8391499bbbad75b0a0bf79523f20a6baa78 /include | |
| parent | a5898ea09aaded8a8236b12f3920f4e6f9b8fc13 (diff) | |
| parent | 10d089bd4b289cbe08d2565f34e030c8980682f4 (diff) | |
| download | linux-43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39.tar.xz | |
Merge tag 'linux-can-next-for-4.2-20150506' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-05-06
this is a pull request of a seven patches for net-next/master.
Andreas Gröger contributes two patches for the janz-ican3 driver. In
the first patch, the documentation for already existing sysfs entries
is added, the second patch adds support for another module/firmware
variant. A patch by Shawn Landden makes the padding in the struct
can_frame explicit. The next 4 patches target the flexcan driver, the
first one is by David Jander adding some documentation, the reaming
three by me add more documentation and two small code cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/can.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h index 41892f720057..9692cda5f8fc 100644 --- a/include/uapi/linux/can.h +++ b/include/uapi/linux/can.h @@ -95,11 +95,17 @@ typedef __u32 can_err_mask_t; * @can_dlc: frame payload length in byte (0 .. 8) aka data length code * N.B. the DLC field from ISO 11898-1 Chapter 8.4.2.3 has a 1:1 * mapping of the 'data length code' to the real payload length + * @__pad: padding + * @__res0: reserved / padding + * @__res1: reserved / padding * @data: CAN frame payload (up to 8 byte) */ struct can_frame { canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ __u8 can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */ + __u8 __pad; /* padding */ + __u8 __res0; /* reserved / padding */ + __u8 __res1; /* reserved / padding */ __u8 data[CAN_MAX_DLEN] __attribute__((aligned(8))); }; |