diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-04 13:30:09 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-04 13:30:09 +0300 |
| commit | 9c0532f9cc939b470e7008fdb659f46d463f386b (patch) | |
| tree | 43ad68ba7121d0df07cc7f65f87449c02873fc51 /include | |
| parent | 51b8f812e5b327b343232685ea7969e02348d5dd (diff) | |
| parent | d85165b2381ce2638cfb8c8787a61b97b38251c2 (diff) | |
| download | linux-9c0532f9cc939b470e7008fdb659f46d463f386b.tar.xz | |
Merge tag 'linux-can-next-for-5.15-20210804' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2021-08-04
this is a pull request of 5 patches for net-next/master.
The first patch is by me and fixes a typo in a comment in the CAN
J1939 protocol.
The next 2 patches are by Oleksij Rempel and update the CAN J1939
protocol to send RX status updates via the error queue mechanism.
The next patch is by me and adds a missing variable initialization to
the flexcan driver (the problem was introduced in the current net-next
cycle).
The last patch is by Aswath Govindraju and adds power-domains to the
Bosch m_can DT binding documentation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/can/j1939.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/uapi/linux/can/j1939.h b/include/uapi/linux/can/j1939.h index df6e821075c1..38936460f668 100644 --- a/include/uapi/linux/can/j1939.h +++ b/include/uapi/linux/can/j1939.h @@ -78,11 +78,20 @@ enum { enum { J1939_NLA_PAD, J1939_NLA_BYTES_ACKED, + J1939_NLA_TOTAL_SIZE, + J1939_NLA_PGN, + J1939_NLA_SRC_NAME, + J1939_NLA_DEST_NAME, + J1939_NLA_SRC_ADDR, + J1939_NLA_DEST_ADDR, }; enum { J1939_EE_INFO_NONE, J1939_EE_INFO_TX_ABORT, + J1939_EE_INFO_RX_RTS, + J1939_EE_INFO_RX_DPO, + J1939_EE_INFO_RX_ABORT, }; struct j1939_filter { |