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 /include/net | |
| 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 'include/net')
| -rw-r--r-- | include/net/netns/can.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/netns/can.h b/include/net/netns/can.h index ecf238b8862c..ca9bd9fba5b5 100644 --- a/include/net/netns/can.h +++ b/include/net/netns/can.h @@ -8,7 +8,7 @@ #include <linux/spinlock.h> -struct dev_rcv_lists; +struct can_dev_rcv_lists; struct s_stats; struct s_pstats; @@ -28,7 +28,7 @@ struct netns_can { #endif /* receive filters subscribed for 'all' CAN devices */ - struct dev_rcv_lists *can_rx_alldev_list; + struct can_dev_rcv_lists *can_rx_alldev_list; spinlock_t can_rcvlists_lock; struct timer_list can_stattimer;/* timer for statistics update */ struct s_stats *can_stats; /* packet statistics */ |