diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-15 16:13:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-15 16:13:34 -0500 |
| commit | 79d891c1bbb6573cef31dbc2030fba61cfa1df6d (patch) | |
| tree | 35a384bd5584a217ae63d33020879afb6a076713 /net/can/proc.c | |
| parent | 5138eb9b2a744f780194b292bffd8638c7a6d423 (diff) | |
| parent | ff847ee47be27621f978921919f035fcd87d6d08 (diff) | |
Merge tag 'linux-can-next-for-4.16-20180105' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2017-12-01,Re: pull-request: can-next
this is a pull request of 7 patches for net-next/master.
All patches are by me. Patch 6 is for the "can_raw" protocol and add
error checking to the bind() function. All other patches clean up the
coding style and remove unused parameters in various CAN drivers and
infrastructure.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can/proc.c')
| -rw-r--r-- | net/can/proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/can/proc.c b/net/can/proc.c index 0c59f876fe6f0..45e38a3085bcd 100644 --- a/net/can/proc.c +++ b/net/can/proc.c @@ -338,7 +338,7 @@ static const struct file_operations can_version_proc_fops = { static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx, struct net_device *dev, - struct dev_rcv_lists *d) + struct can_dev_rcv_lists *d) { if (!hlist_empty(&d->rx[idx])) { can_print_recv_banner(m); @@ -353,7 +353,7 @@ static int can_rcvlist_proc_show(struct seq_file *m, void *v) /* double cast to prevent GCC warning */ int idx = (int)(long)PDE_DATA(m->file->f_inode); struct net_device *dev; - struct dev_rcv_lists *d; + struct can_dev_rcv_lists *d; struct net *net = m->private; seq_printf(m, "\nreceive list '%s':\n", rx_list_name[idx]); @@ -417,7 +417,7 @@ static inline void can_rcvlist_proc_show_array(struct seq_file *m, static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v) { struct net_device *dev; - struct dev_rcv_lists *d; + struct can_dev_rcv_lists *d; struct net *net = m->private; /* RX_SFF */ @@ -461,7 +461,7 @@ static const struct file_operations can_rcvlist_sff_proc_fops = { static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v) { struct net_device *dev; - struct dev_rcv_lists *d; + struct can_dev_rcv_lists *d; struct net *net = m->private; /* RX_EFF */ |