diff options
author | Oliver Hartkopp <socketcan@hartkopp.net> | 2012-05-08 16:20:33 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-23 16:55:49 -0400 |
commit | d6e640f9766e2fb9aa3853b4ff19e4d7d5d7e373 (patch) | |
tree | 8042b08dfb17169907f71c65215bf4ec421f5ec5 /include/linux/can.h | |
parent | 8b5e218d8caa7592d26e68157bd71f50426bb7ae (diff) |
can: update documentation wording error frames -> error messages
As Heinz-Juergen Oertel pointed out 'CAN error frames' are a already defined
term for the CAN protocol violation indication on the wire.
To avoid confusion with the error messages created by CAN drivers available
via CAN RAW sockets update the documentation and change the naming from
'error frames' to 'error messages' or 'error message frames'.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'include/linux/can.h')
-rw-r--r-- | include/linux/can.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/can.h b/include/linux/can.h index 9a19bcb3eeaf..17334c09bd93 100644 --- a/include/linux/can.h +++ b/include/linux/can.h | |||
@@ -21,7 +21,7 @@ | |||
21 | /* special address description flags for the CAN_ID */ | 21 | /* special address description flags for the CAN_ID */ |
22 | #define CAN_EFF_FLAG 0x80000000U /* EFF/SFF is set in the MSB */ | 22 | #define CAN_EFF_FLAG 0x80000000U /* EFF/SFF is set in the MSB */ |
23 | #define CAN_RTR_FLAG 0x40000000U /* remote transmission request */ | 23 | #define CAN_RTR_FLAG 0x40000000U /* remote transmission request */ |
24 | #define CAN_ERR_FLAG 0x20000000U /* error frame */ | 24 | #define CAN_ERR_FLAG 0x20000000U /* error message frame */ |
25 | 25 | ||
26 | /* valid bits in CAN ID for frame formats */ | 26 | /* valid bits in CAN ID for frame formats */ |
27 | #define CAN_SFF_MASK 0x000007FFU /* standard frame format (SFF) */ | 27 | #define CAN_SFF_MASK 0x000007FFU /* standard frame format (SFF) */ |
@@ -32,14 +32,14 @@ | |||
32 | * Controller Area Network Identifier structure | 32 | * Controller Area Network Identifier structure |
33 | * | 33 | * |
34 | * bit 0-28 : CAN identifier (11/29 bit) | 34 | * bit 0-28 : CAN identifier (11/29 bit) |
35 | * bit 29 : error frame flag (0 = data frame, 1 = error frame) | 35 | * bit 29 : error message frame flag (0 = data frame, 1 = error message) |
36 | * bit 30 : remote transmission request flag (1 = rtr frame) | 36 | * bit 30 : remote transmission request flag (1 = rtr frame) |
37 | * bit 31 : frame format flag (0 = standard 11 bit, 1 = extended 29 bit) | 37 | * bit 31 : frame format flag (0 = standard 11 bit, 1 = extended 29 bit) |
38 | */ | 38 | */ |
39 | typedef __u32 canid_t; | 39 | typedef __u32 canid_t; |
40 | 40 | ||
41 | /* | 41 | /* |
42 | * Controller Area Network Error Frame Mask structure | 42 | * Controller Area Network Error Message Frame Mask structure |
43 | * | 43 | * |
44 | * bit 0-28 : error class mask (see include/linux/can/error.h) | 44 | * bit 0-28 : error class mask (see include/linux/can/error.h) |
45 | * bit 29-31 : set to zero | 45 | * bit 29-31 : set to zero |
@@ -97,7 +97,7 @@ struct sockaddr_can { | |||
97 | * <received_can_id> & mask == can_id & mask | 97 | * <received_can_id> & mask == can_id & mask |
98 | * | 98 | * |
99 | * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can | 99 | * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can |
100 | * filter for error frames (CAN_ERR_FLAG bit set in mask). | 100 | * filter for error message frames (CAN_ERR_FLAG bit set in mask). |
101 | */ | 101 | */ |
102 | struct can_filter { | 102 | struct can_filter { |
103 | canid_t can_id; | 103 | canid_t can_id; |