Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

can: isotp: remove ISO 15675-2 specification version where possible

With the new ISO 15765-2:2024 release the former documentation and comments
have to be reworked. This patch removes the ISO specification version/date
where possible.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Acked-by: Francesco Valla <valla.francesco@gmail.com>
Link: https://lore.kernel.org/all/20240420194746.4885-1-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

authored by

Oliver Hartkopp and committed by
Marc Kleine-Budde
ba63a7e0 58b34cd6

+12 -12
+1 -1
include/uapi/linux/can/isotp.h
··· 2 2 /* 3 3 * linux/can/isotp.h 4 4 * 5 - * Definitions for isotp CAN sockets (ISO 15765-2:2016) 5 + * Definitions for ISO 15765-2 CAN transport protocol sockets 6 6 * 7 7 * Copyright (c) 2020 Volkswagen Group Electronic Research 8 8 * All rights reserved.
+5 -6
net/can/Kconfig
··· 56 56 source "net/can/j1939/Kconfig" 57 57 58 58 config CAN_ISOTP 59 - tristate "ISO 15765-2:2016 CAN transport protocol" 59 + tristate "ISO 15765-2 CAN transport protocol" 60 60 help 61 61 CAN Transport Protocols offer support for segmented Point-to-Point 62 62 communication between CAN nodes via two defined CAN Identifiers. 63 + This protocol driver implements segmented data transfers for CAN CC 64 + (aka Classical CAN, CAN 2.0B) and CAN FD frame types which were 65 + introduced with ISO 15765-2:2016. 63 66 As CAN frames can only transport a small amount of data bytes 64 - (max. 8 bytes for 'classic' CAN and max. 64 bytes for CAN FD) this 67 + (max. 8 bytes for CAN CC and max. 64 bytes for CAN FD) this 65 68 segmentation is needed to transport longer Protocol Data Units (PDU) 66 69 as needed e.g. for vehicle diagnosis (UDS, ISO 14229) or IP-over-CAN 67 70 traffic. 68 - This protocol driver implements data transfers according to 69 - ISO 15765-2:2016 for 'classic' CAN and CAN FD frame types. 70 - If you want to perform automotive vehicle diagnostic services (UDS), 71 - say 'y'. 72 71 73 72 endif
+6 -5
net/can/isotp.c
··· 72 72 #include <net/sock.h> 73 73 #include <net/net_namespace.h> 74 74 75 - MODULE_DESCRIPTION("PF_CAN isotp 15765-2:2016 protocol"); 75 + MODULE_DESCRIPTION("PF_CAN ISO 15765-2 transport protocol"); 76 76 MODULE_LICENSE("Dual BSD/GPL"); 77 77 MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>"); 78 78 MODULE_ALIAS("can-proto-6"); ··· 83 83 (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ 84 84 (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) 85 85 86 - /* ISO 15765-2:2016 supports more than 4095 byte per ISO PDU as the FF_DL can 87 - * take full 32 bit values (4 Gbyte). We would need some good concept to handle 88 - * this between user space and kernel space. For now set the static buffer to 89 - * something about 8 kbyte to be able to test this new functionality. 86 + /* Since ISO 15765-2:2016 the CAN isotp protocol supports more than 4095 87 + * byte per ISO PDU as the FF_DL can take full 32 bit values (4 Gbyte). 88 + * We would need some good concept to handle this between user space and 89 + * kernel space. For now set the static buffer to something about 8 kbyte 90 + * to be able to test this new functionality. 90 91 */ 91 92 #define DEFAULT_MAX_PDU_SIZE 8300 92 93