diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 11:54:53 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 11:54:53 -0800 |
| commit | 4c971aa78314253cce914ed29e3d90df3326d646 (patch) | |
| tree | a9dcf0b1fdc9e1aacff90afb5b3ab79983115dcc /include/uapi/linux/can/netlink.h | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: psmouse - use IS_ENABLED instead of homegrown code (diff) | |
| download | linux-dev-4c971aa78314253cce914ed29e3d90df3326d646.tar.xz linux-dev-4c971aa78314253cce914ed29e3d90df3326d646.zip | |
Merge branch 'next' into for-linus
Second round of updates for 3.20.
Diffstat (limited to 'include/uapi/linux/can/netlink.h')
| -rw-r--r-- | include/uapi/linux/can/netlink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index 3e4323a3918d..94ffe0c83ce7 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h @@ -98,6 +98,7 @@ struct can_ctrlmode { #define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ #define CAN_CTRLMODE_FD 0x20 /* CAN FD mode */ #define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */ +#define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */ /* * CAN device statistics |