Marc Kleine-Budde says: ==================== pull-request: can-next 2023-06-22 The first patch is by Carsten Schmidt, targets the kvaser_usb driver and adds len8_dlc support. Marcel Hellwig's patch for the xilinx_can driver adds support for CAN transceivers via the PHY framework. Frank Jungclaus contributes 6+2 patches for the esd_usb driver in preparation for the upcoming CAN-USB/3 support. The 2 patches by Miquel Raynal for the sja1000 driver work around overruns stalls on the Renesas SoCs. The next 3 patches are by me and fix the coding style in the rx-offload helper and in the m_can and ti_hecc driver. Vincent Mailhol contributes 3 patches to fix and update the calculation of the length of CAN frames on the wire. Oliver Hartkopp's patch moves the CAN_RAW_FILTER_MAX definition into the correct header. The remaining 14 patches are by Jimmy Assarsson, target the kvaser_pciefd driver and bring various updates and improvements. * tag 'linux-can-next-for-6.5-20230622' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (33 commits) can: kvaser_pciefd: Use TX FIFO size read from CAN controller can: kvaser_pciefd: Refactor code can: kvaser_pciefd: Add len8_dlc support can: kvaser_pciefd: Use FIELD_{GET,PREP} and GENMASK where appropriate can: kvaser_pciefd: Sort register definitions can: kvaser_pciefd: Change return type for kvaser_pciefd_{receive,transmit,set_tx}_irq() can: kvaser_pciefd: Rename device ID defines can: kvaser_pciefd: Sort includes in alphabetic order can: kvaser_pciefd: Remove SPI flash parameter read functionality can: uapi: move CAN_RAW_FILTER_MAX definition to raw.h can: kvaser_pciefd: Define unsigned constants with type suffix 'U' can: kvaser_pciefd: Set hardware timestamp on transmitted packets can: kvaser_pciefd: Add function to set skb hwtstamps can: kvaser_pciefd: Remove handler for unused KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK can: kvaser_pciefd: Remove useless write to interrupt register can: length: refactor frame lengths definition to add size in bits can: length: fix bitstuffing count can: length: fix description of the RRS field can: m_can: fix coding style can: ti_hecc: fix coding style ... ====================
Showing the changes to include/uapi (2 of 17 files). Show all
Unified · Split
| @@ -285,6 +285,5 @@ struct can_filter { · 284 unmodified lines | |||
| 285 | }; | 285 | }; |
| 286 | 286 | ||
| 287 | #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */ | 287 | #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */ |
| 288 | #define CAN_RAW_FILTER_MAX 512 /* maximum number of can_filter set via setsockopt() */ | ||
| 289 | 288 | ||
| 290 | #endif /* !_UAPI_CAN_H */ | 289 | #endif /* !_UAPI_CAN_H */ |
| @@ -49,6 +49,8 @@ · 48 unmodified lines | |||
| 49 | #include <linux/can.h> | 49 | #include <linux/can.h> |
| 50 | 50 | ||
| 51 | #define SOL_CAN_RAW (SOL_CAN_BASE + CAN_RAW) | 51 | #define SOL_CAN_RAW (SOL_CAN_BASE + CAN_RAW) |
| 52 | #define CAN_RAW_FILTER_MAX 512 /* maximum number of can_filter set via setsockopt() */ | ||
| 53 | |||
| 52 | enum { | 54 | enum { |
| 53 | SCM_CAN_RAW_ERRQUEUE = 1, | 55 | SCM_CAN_RAW_ERRQUEUE = 1, |
| 54 | }; | 56 | }; |