diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-26 21:52:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-26 21:52:15 +0200 |
| commit | d0c5d18da2da00f3bf550286426fabd01cb63bde (patch) | |
| tree | da1ee20e7e51f06a6981bb6e1a66d6b9846b2ced /Documentation | |
| parent | net: davicom: Remove redundant assignment to ret (diff) | |
| parent | can: proc: fix rcvlist_* header alignment on 64-bit system (diff) | |
| download | linux-d0c5d18da2da00f3bf550286426fabd01cb63bde.tar.xz linux-d0c5d18da2da00f3bf550286426fabd01cb63bde.zip | |
Merge tag 'linux-can-next-for-5.13-20210426' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2021-04-26
this is a pull request of 4 patches for net-next/master.
the first two patches are from Colin Ian King and target the
etas_es58x driver, they add a missing NULL pointer check and fix some
typos.
The next two patches are by Erik Flodin. The first one updates the CAN
documentation regarding filtering, the other one fixes the header
alignment in CAN related proc output on 64 bit systems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/can.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/networking/can.rst b/Documentation/networking/can.rst index f8dae662e454..f34cb0e4460e 100644 --- a/Documentation/networking/can.rst +++ b/Documentation/networking/can.rst @@ -608,6 +608,8 @@ demand: setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS, &recv_own_msgs, sizeof(recv_own_msgs)); +Note that reception of a socket's own CAN frames are subject to the same +filtering as other CAN frames (see :ref:`socketcan-rawfilter`). .. _socketcan-rawfd: |