diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-15 17:39:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-15 17:39:39 -0700 |
| commit | 725b70185d6b4ae73dc563725a95a0c10e242df5 (patch) | |
| tree | 35d241f6a643ca85ec9e50a66b5d55e6b984303f /include/uapi/linux | |
| parent | 26c4fdb0528ae7c4be9fbc8a8210f3b410e6b5aa (diff) | |
| parent | 5b853ec3494e34eb4882f65ebbcd04b495ff3c85 (diff) | |
| download | linux-725b70185d6b4ae73dc563725a95a0c10e242df5.tar.gz linux-725b70185d6b4ae73dc563725a95a0c10e242df5.tar.bz2 linux-725b70185d6b4ae73dc563725a95a0c10e242df5.zip | |
Merge tag 'linux-can-next-for-3.17-20140715' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2014-07-15
this is a pull request of 4 patches for net-next/master.
Prabhakar Lad contributes a patch that converts the c_can driver to use
the devm api. The remaining four patches by Nikita Edward Baruzdin
improve the SJA1000 driver with loopback testing support and introduce
a new testing mode presume ack, for successful transmission even if no
ACK is received.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/can/netlink.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index 813d11f54977..3e4323a3918d 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h @@ -92,11 +92,12 @@ struct can_ctrlmode { }; #define CAN_CTRLMODE_LOOPBACK 0x01 /* Loopback mode */ -#define CAN_CTRLMODE_LISTENONLY 0x02 /* Listen-only mode */ +#define CAN_CTRLMODE_LISTENONLY 0x02 /* Listen-only mode */ #define CAN_CTRLMODE_3_SAMPLES 0x04 /* Triple sampling mode */ #define CAN_CTRLMODE_ONE_SHOT 0x08 /* One-Shot mode */ #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 */ /* * CAN device statistics |