On Mon, Oct 30, 2023 at 12:30:27PM +0100, Oliver Hartkopp wrote:
The backport of commit 9c5df2f14ee3 ("can: isotp: isotp_ops: fix poll() to not report false EPOLLOUT events") introduced a new regression where the fix could potentially introduce new side effects.
To reduce the risk of other unmet dependencies and missing fixes and checks the latest mainline code base is ported back to the 5.10 LTS tree.
To meet the former Linux 5.10 API these commits have been reverted: e3ae2365efc1 ("net: sock: introduce sk_error_report") f4b41f062c42 ("net: remove noblock parameter from skb_recv_datagram()") 96a7457a14d9 ("can: skb: unify skb CAN frame identification helpers") dc97391e6610 ("sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)") 0145462fc802 ("can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get SOCK_RXQ_OVFL infos")
New features and communication stability measures: 9f39d36530e5 ("can: isotp: add support for transmission without flow control") 96d1c81e6a04 ("can: isotp: add module parameter for maximum pdu size") 4b7fe92c0690 ("can: isotp: add local echo tx processing for consecutive frames") 530e0d46c613 ("can: isotp: set default value for N_As to 50 micro seconds")
And various sanity checks, fixes and improved return values.
Signed-off-by: Oliver Hartkopp socketcan@hartkopp.net
include/uapi/linux/can/isotp.h | 25 +- net/can/isotp.c | 495 ++++++++++++++++++++++----------- 2 files changed, 347 insertions(+), 173 deletions(-)
Same here, sorry, we need the individual commits.
greg k-h