diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-03 14:32:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-03 14:32:15 +0300 |
| commit | a48e789dd2633bdeb6552dfdfedd0435f9c2f897 (patch) | |
| tree | c3da36cd25f47021bac6783bfb14ddc2413a4775 /include | |
| parent | c67289e064cacda22ace61b8079a4e3f0e4aa520 (diff) | |
| parent | 0ebd5529d2ddab76a46681991d350b82c62ef13e (diff) | |
| download | linux-a48e789dd2633bdeb6552dfdfedd0435f9c2f897.tar.xz | |
Merge tag 'linux-can-next-for-5.20-20220703' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2022-07-03
this is a pull request of 15 patches for net-next/master.
The first 2 patches are by Max Staudt and add the can327 serial CAN
driver along with a new line discipline ID.
The next patch is by me an fixes a typo in the ctucanfd driver.
The last 12 patches are by Dario Binacchi and integrate slcan CAN
serial driver better into the existing CAN driver API.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/bittiming.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/tty.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/can/bittiming.h b/include/linux/can/bittiming.h index 7ae21c0f7f23..ef0a77173e3c 100644 --- a/include/linux/can/bittiming.h +++ b/include/linux/can/bittiming.h @@ -11,6 +11,8 @@ #define CAN_SYNC_SEG 1 +#define CAN_BITRATE_UNSET 0 +#define CAN_BITRATE_UNKNOWN (-1U) #define CAN_CTRLMODE_TDC_MASK \ (CAN_CTRLMODE_TDC_AUTO | CAN_CTRLMODE_TDC_MANUAL) diff --git a/include/uapi/linux/tty.h b/include/uapi/linux/tty.h index 9d0f06bfbac3..68aeae2addec 100644 --- a/include/uapi/linux/tty.h +++ b/include/uapi/linux/tty.h @@ -38,8 +38,9 @@ #define N_NULL 27 /* Null ldisc used for error handling */ #define N_MCTP 28 /* MCTP-over-serial */ #define N_DEVELOPMENT 29 /* Manual out-of-tree testing */ +#define N_CAN327 30 /* ELM327 based OBD-II interfaces */ /* Always the newest line discipline + 1 */ -#define NR_LDISCS 30 +#define NR_LDISCS 31 #endif /* _UAPI_LINUX_TTY_H */ |