mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Oliver Hartkopp 2024-04-20 21:47:46 +02:00 committed by Marc Kleine-Budde
parent 58b34cd646
commit ba63a7e085
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/can/isotp.h
View File

@ -2,7 +2,7 @@
/* /*
* linux/can/isotp.h * linux/can/isotp.h
* *
* Definitions for isotp CAN sockets (ISO 15765-2:2016) * Definitions for ISO 15765-2 CAN transport protocol sockets
* *
* Copyright (c) 2020 Volkswagen Group Electronic Research * Copyright (c) 2020 Volkswagen Group Electronic Research
* All rights reserved. * All rights reserved.

11
net/can/Kconfig
View File

@ -56,18 +56,17 @@ config CAN_GW
source "net/can/j1939/Kconfig" source "net/can/j1939/Kconfig"
config CAN_ISOTP config CAN_ISOTP
tristate "ISO 15765-2:2016 CAN transport protocol" tristate "ISO 15765-2 CAN transport protocol"
help help
CAN Transport Protocols offer support for segmented Point-to-Point CAN Transport Protocols offer support for segmented Point-to-Point
communication between CAN nodes via two defined CAN Identifiers. communication between CAN nodes via two defined CAN Identifiers.
This protocol driver implements segmented data transfers for CAN CC
(aka Classical CAN, CAN 2.0B) and CAN FD frame types which were
introduced with ISO 15765-2:2016.
As CAN frames can only transport a small amount of data bytes As CAN frames can only transport a small amount of data bytes
(max. 8 bytes for 'classic' CAN and max. 64 bytes for CAN FD) this (max. 8 bytes for CAN CC and max. 64 bytes for CAN FD) this
segmentation is needed to transport longer Protocol Data Units (PDU) segmentation is needed to transport longer Protocol Data Units (PDU)
as needed e.g. for vehicle diagnosis (UDS, ISO 14229) or IP-over-CAN as needed e.g. for vehicle diagnosis (UDS, ISO 14229) or IP-over-CAN
traffic. traffic.
This protocol driver implements data transfers according to
ISO 15765-2:2016 for 'classic' CAN and CAN FD frame types.
If you want to perform automotive vehicle diagnostic services (UDS),
say 'y'.
endif endif

11
net/can/isotp.c
View File

@ -72,7 +72,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
MODULE_DESCRIPTION("PF_CAN isotp 15765-2:2016 protocol"); MODULE_DESCRIPTION("PF_CAN ISO 15765-2 transport protocol");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>"); MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>");
MODULE_ALIAS("can-proto-6"); MODULE_ALIAS("can-proto-6");
@ -83,10 +83,11 @@ MODULE_ALIAS("can-proto-6");
(CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \
(CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
/* ISO 15765-2:2016 supports more than 4095 byte per ISO PDU as the FF_DL can /* Since ISO 15765-2:2016 the CAN isotp protocol supports more than 4095
* take full 32 bit values (4 Gbyte). We would need some good concept to handle * byte per ISO PDU as the FF_DL can take full 32 bit values (4 Gbyte).
* this between user space and kernel space. For now set the static buffer to * We would need some good concept to handle this between user space and
* something about 8 kbyte to be able to test this new functionality. * kernel space. For now set the static buffer to something about 8 kbyte
* to be able to test this new functionality.
*/ */
#define DEFAULT_MAX_PDU_SIZE 8300 #define DEFAULT_MAX_PDU_SIZE 8300