diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-27 19:19:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-27 19:19:29 +0300 |
| commit | a00ebc464d210dbb293212a7552e47d8ed645d66 (patch) | |
| tree | 72c9956e3e16b13968b42a85d65ff45817ee3722 /include/uapi | |
| parent | 45ce0fd19da9ca21635c367d504b9e4904621ff4 (diff) | |
| parent | 1e9bbb9bc2aa549d31fa0a0496ec33df0b3ae7a8 (diff) | |
| download | linux-a00ebc464d210dbb293212a7552e47d8ed645d66.tar.xz | |
Merge tag 'linux-can-next-for-4.11-20170124' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2017-01-24
this is a pull request of 4 patches for net-next/master.
The first patch by Oliver Hartkopp adds a netlink API to configure the
interface termination of a CAN card. The next two patches are by me and
add a netlink API to query and configure CAN interfaces that only
support fixed bitrates. The last patch by Colin Ian King simplifies the
return path in the softing_cs driver's softingcs_probe() function.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/can/netlink.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index 94ffe0c83ce7..fdf75f74fdaf 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h @@ -127,9 +127,16 @@ enum { IFLA_CAN_BERR_COUNTER, IFLA_CAN_DATA_BITTIMING, IFLA_CAN_DATA_BITTIMING_CONST, + IFLA_CAN_TERMINATION, + IFLA_CAN_TERMINATION_CONST, + IFLA_CAN_BITRATE_CONST, + IFLA_CAN_DATA_BITRATE_CONST, __IFLA_CAN_MAX }; #define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1) +/* u16 termination range: 1..65535 Ohms */ +#define CAN_TERMINATION_DISABLED 0 + #endif /* !_UAPI_CAN_NETLINK_H */ |