From 06d3beb08ca55dfa3c33401d7542fad1d3e48898 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 4 Apr 2019 10:17:27 +0200 Subject: [PATCH] include: import header files from linux-5.0 (including new j1939 patches) Signed-off-by: Marc Kleine-Budde --- include/linux/can.h | 7 ++----- include/linux/can/j1939.h | 9 +++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/linux/can.h b/include/linux/can.h index 6248566..4e46a7e 100644 --- a/include/linux/can.h +++ b/include/linux/can.h @@ -77,7 +77,7 @@ typedef __u32 canid_t; /* * Controller Area Network Error Message Frame Mask structure * - * bit 0-28 : error class mask (see include/linux/can/error.h) + * bit 0-28 : error class mask (see include/uapi/linux/can/error.h) * bit 29-31 : set to zero */ typedef __u32 can_err_mask_t; @@ -181,10 +181,7 @@ struct sockaddr_can { int can_ifindex; union { /* transport protocol class address information (e.g. ISOTP) */ - struct { - canid_t rx_id; - canid_t tx_id; - } tp; + struct { canid_t rx_id, tx_id; } tp; /* J1939 address information */ struct { diff --git a/include/linux/can/j1939.h b/include/linux/can/j1939.h index 3063806..cd60d70 100644 --- a/include/linux/can/j1939.h +++ b/include/linux/can/j1939.h @@ -16,9 +16,14 @@ #include #include -#define J1939_IDLE_ADDR 0xfe -#define J1939_NO_ADDR 0xff +#define J1939_IDLE_ADDR 0xfe +#define J1939_MAX_UNICAST_ADDR 0xfd +#define J1939_NO_ADDR 0xff /* == broadcast or no addr */ #define J1939_NO_NAME 0 +#define J1939_PGN_REQUEST 0x0ea00 +#define J1939_PGN_ADDRESS_CLAIMED 0x0ee00 +#define J1939_PGN_PDU1_MAX 0x3ff00 +#define J1939_PGN_MAX 0x3ffff #define J1939_NO_PGN 0x40000 /* J1939 Parameter Group Number