Hello netdev-team,
this is a pull request of 2 patches for net-next/master.
The 1st patch is by Oliver Hartkopp and cleans up the CAN_RAW's
raw_setsockopt() for CAN_RAW_FD_FRAMES.
The 2nd patch is by me and fixes the compilation if
CONFIG_CAN_CALC_BITTIMING is disabled. (Problem introduced in last
pull request to next-next.)
regards,
Marc
---
The following changes since commit e6ebe6c12355538e9238e2051bd6757b12dbfe9c:
Merge branch 'taprio-auto-qmaxsdu-new-tx' (2023-02-08 09:48:53 +0000)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-6.3-20230208
for you to fetch changes up to 65db3d8b5231bd430c12150258125aca155aea97:
can: bittiming: can_calc_bittiming(): add missing parameter to no-op function (2023-02-08 21:53:24 +0100)
----------------------------------------------------------------
linux-can-next-for-6.3-20230208
----------------------------------------------------------------
Marc Kleine-Budde (1):
can: bittiming: can_calc_bittiming(): add missing parameter to no-op function
Oliver Hartkopp (1):
can: raw: use temp variable instead of rolling back config
include/linux/can/bittiming.h | 2 +-
net/can/raw.c | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
