Marc Kleine-Budde says: ==================== pull-request: can-next 2025-09-25 this is a pull request of 48 patches for net-next/main, which supersedes tags/linux-can-next-for-6.18-20250923. The 1st patch is by Xichao Zhao and converts ns_to_ktime() to us_to_ktime() in the m_can driver. Vincent Mailhol contributes 2 patches: Updating the MAINTAINERS and mailmap files to Vincent's new email address and sorting the includes in the CAN helper library alphabeticaly. Stéphane Grosjean's patch modifies all peak CAN drivers and the mailmap to reflect Stéphane's new email address. 4 patches by Biju Das update the CAN-FD handling in the rcar_canfd driver. Followed by 11 patches by Geert Uytterhoeven updating and improving the rcar_can driver. Stefan Mätje contributes 2 patches for the esd_usb driver updating the error messages. The next 3 patch series are all by Vincent Mailhol: 3 patches to optimize the size of struct raw_sock and struct uniqframe. 4 patches which rework the CAN MTU logic as preparation for CAN-XL interfaces. And finally 20 patches that prepare and refactor the CAN netlink code for the upcoming CAN-XL support. * tag 'linux-can-next-for-6.18-20250924' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (48 commits) can: netlink: add userland error messages can: dev: add can_get_ctrlmode_str() can: calc_bittiming: make can_calc_tdco() FD agnostic can: netlink: make can_tdc_fill_info() FD agnostic can: netlink: add can_bitrate_const_fill_info() can: netlink: add can_bittiming_const_fill_info() can: netlink: add can_bittiming_fill_info() can: netlink: add can_data_bittiming_get_size() can: netlink: make can_tdc_get_size() FD agnostic can: netlink: add can_ctrlmode_changelink() can: netlink: add can_dtb_changelink() can: netlink: make can_tdc_changelink() FD agnostic can: netlink: remove useless check in can_tdc_changelink() can: netlink: refactor CAN_CTRLMODE_TDC_{AUTO,MANUAL} flag reset logic can: netlink: add can_validate_databittiming() can: netlink: add can_validate_tdc() can: netlink: refactor can_validate_bittiming() can: netlink: document which symbols are FD specific can: dev: make can_get_relative_tdco() FD agnostic and move it to bittiming.h can: dev: move struct data_bittiming_params to linux/can/bittiming.h ... ====================
Showing the changes to include/uapi (1 of 29 files). Show all
Unified · Split
| @@ -101,8 +101,8 @@ struct can_ctrlmode { · 100 unmodified lines | |||
| 101 | #define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */ | 101 | #define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */ |
| 102 | #define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */ | 102 | #define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */ |
| 103 | #define CAN_CTRLMODE_CC_LEN8_DLC 0x100 /* Classic CAN DLC option */ | 103 | #define CAN_CTRLMODE_CC_LEN8_DLC 0x100 /* Classic CAN DLC option */ |
| 104 | #define CAN_CTRLMODE_TDC_AUTO 0x200 /* CAN transiver automatically calculates TDCV */ | 104 | #define CAN_CTRLMODE_TDC_AUTO 0x200 /* FD transceiver automatically calculates TDCV */ |
| 105 | #define CAN_CTRLMODE_TDC_MANUAL 0x400 /* TDCV is manually set up by user */ | 105 | #define CAN_CTRLMODE_TDC_MANUAL 0x400 /* FD TDCV is manually set up by user */ |
| 106 | 106 | ||
| 107 | /* | 107 | /* |
| 108 | * CAN device statistics | 108 | * CAN device statistics |
| @@ -129,14 +129,14 @@ enum { · 20 unmodified lines | |||
| 129 | IFLA_CAN_RESTART_MS, | 129 | IFLA_CAN_RESTART_MS, |
| 130 | IFLA_CAN_RESTART, | 130 | IFLA_CAN_RESTART, |
| 131 | IFLA_CAN_BERR_COUNTER, | 131 | IFLA_CAN_BERR_COUNTER, |
| 132 | IFLA_CAN_DATA_BITTIMING, | 132 | IFLA_CAN_DATA_BITTIMING, /* FD */ |
| 133 | IFLA_CAN_DATA_BITTIMING_CONST, | 133 | IFLA_CAN_DATA_BITTIMING_CONST, /* FD */ |
| 134 | IFLA_CAN_TERMINATION, | 134 | IFLA_CAN_TERMINATION, |
| 135 | IFLA_CAN_TERMINATION_CONST, | 135 | IFLA_CAN_TERMINATION_CONST, |
| 136 | IFLA_CAN_BITRATE_CONST, | 136 | IFLA_CAN_BITRATE_CONST, |
| 137 | IFLA_CAN_DATA_BITRATE_CONST, | 137 | IFLA_CAN_DATA_BITRATE_CONST, /* FD */ |
| 138 | IFLA_CAN_BITRATE_MAX, | 138 | IFLA_CAN_BITRATE_MAX, |
| 139 | IFLA_CAN_TDC, | 139 | IFLA_CAN_TDC, /* FD */ |
| 140 | IFLA_CAN_CTRLMODE_EXT, | 140 | IFLA_CAN_CTRLMODE_EXT, |
| 141 | 141 | ||
| 142 | /* add new constants above here */ | 142 | /* add new constants above here */ |
| @@ -145,7 +145,7 @@ enum { · 2 unmodified lines | |||
| 145 | }; | 145 | }; |
| 146 | 146 | ||
| 147 | /* | 147 | /* |
| 148 | * CAN FD Transmitter Delay Compensation (TDC) | 148 | * CAN FD/XL Transmitter Delay Compensation (TDC) |
| 149 | * | 149 | * |
| 150 | * Please refer to struct can_tdc_const and can_tdc in | 150 | * Please refer to struct can_tdc_const and can_tdc in |
| 151 | * include/linux/can/bittiming.h for further details. | 151 | * include/linux/can/bittiming.h for further details. |