diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-26 12:52:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-26 12:52:15 -0700 |
| commit | d0c5d18da2da00f3bf550286426fabd01cb63bde (patch) | |
| tree | da1ee20e7e51f06a6981bb6e1a66d6b9846b2ced /net | |
| parent | 9176e38027195346f50ab885498678ca7ae55a21 (diff) | |
| parent | e6b031d3c37f79d135c642834bdda7233a29db8d (diff) | |
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 'net')
| -rw-r--r-- | net/can/proc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/can/proc.c b/net/can/proc.c index b15760b5c1cc..d1fe49e6f16d 100644 --- a/net/can/proc.c +++ b/net/can/proc.c @@ -205,8 +205,10 @@ static void can_print_recv_banner(struct seq_file *m) * can1. 00000000 00000000 00000000 * ....... 0 tp20 */ - seq_puts(m, " device can_id can_mask function" - " userdata matches ident\n"); + if (IS_ENABLED(CONFIG_64BIT)) + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); + else + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); } static int can_stats_proc_show(struct seq_file *m, void *v) |