diff options
| author |   David S. Miller <davem@davemloft.net> | 2022-01-09 16:57:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-01-09 16:57:50 +0000 |
| commit | d5c8725cc913f1ab8e2f10a4eda2930bfdc03f1f (patch) | |
| tree | d74046ca7aa8938081eccc85af9397616c3db621 /net/netfilter/nf_tables_trace.c | |
| parent | Merge branch 'ena-capabilities-field-and-cosmetic-changes' (diff) | |
| parent | docs: networking: device drivers: can: add flexcan (diff) | |
| download | linux-dev-d5c8725cc913f1ab8e2f10a4eda2930bfdc03f1f.tar.xz linux-dev-d5c8725cc913f1ab8e2f10a4eda2930bfdc03f1f.zip | |
Merge tag 'linux-can-next-for-5.17-20220108' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2022-01-08
this is a pull request of 22 patches for net-next/master.
The first patch is by Tom Rix and fixes an uninitialized variable in
the janz-ican3 driver (introduced in linux-can-next-for-5.17-20220105).
The next 13 patches are by my and target the mcp251xfd driver. First
several cleanup patches, then the driver is prepared for the upcoming
ethtool ring parameter and IRQ coalescing support, which is added in a
later pull request.
The remaining 8 patches are by Dario Binacchi and me and enhance the
flexcan driver. The driver is moved into a sub directory. An ethtool
private flag is added to optionally disable CAN RTR frame reception,
to make use of more RX buffers. The resulting RX buffer configuration
can be read by ethtool ring parameter support. Finally documentation
for the ethtool private flag is added to the
Documentation/networking/device_drivers/can directory.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_tables_trace.c')
0 files changed, 0 insertions, 0 deletions