diff options
| author |   David S. Miller <davem@davemloft.net> | 2022-07-03 12:32:15 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-03 12:32:15 +0100 |
| commit | a48e789dd2633bdeb6552dfdfedd0435f9c2f897 (patch) | |
| tree | c3da36cd25f47021bac6783bfb14ddc2413a4775 /include/linux | |
| parent | Merge tag 'mlx5-updates-2022-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (diff) | |
| parent | Merge branch 'can-slcan-extend-supported-features' (diff) | |
| download | linux-dev-a48e789dd2633bdeb6552dfdfedd0435f9c2f897.tar.xz linux-dev-a48e789dd2633bdeb6552dfdfedd0435f9c2f897.zip | |
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/linux')
| -rw-r--r-- | include/linux/can/bittiming.h | 2 |
1 files changed, 2 insertions, 0 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) |