Hello David, this is a pull request of 4 patches for net-next/master.
The first patch by Oliver Hartkopp adds a netlink API to configure the
interface termination of a CAN card. The next two patches are by me and
add a netlink API to query and configure CAN interfaces that only
support fixed bitrates. The last patch by Colin Ian King simplifies the
return path in the softing_cs driver's softingcs_probe() function.
regards,
Marc
---
The following changes since commit d140199af510ad4749dc5e38b7922135258ba5fd:
bpf, lpm: fix kfree of im_node in trie_update_elem (2017-01-23 21:17:35 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
tags/linux-can-next-for-4.11-20170124
for you to fetch changes up to 1e9bbb9bc2aa549d31fa0a0496ec33df0b3ae7a8:
can: softing_cs: ret is never non-zero, so remove non-zero check and -ENODEV
return (2017-01-24 13:52:00 +0100)
----------------------------------------------------------------
linux-can-next-for-4.11-20170124
----------------------------------------------------------------
Colin Ian King (1):
can: softing_cs: ret is never non-zero, so remove non-zero check and
-ENODEV return
Marc Kleine-Budde (2):
can: dev: can_changelink: allow to set bitrate on devices not providing
{data_,}bittiming_const
can: dev: add CAN interface API for fixed bitrates
Oliver Hartkopp (1):
can: dev: add CAN interface termination API
drivers/net/can/dev.c | 136 ++++++++++++++++++++++++++++++++---
drivers/net/can/softing/softing_cs.c | 2 +-
include/linux/can/dev.h | 8 +++
include/uapi/linux/can/netlink.h | 7 ++
4 files changed, 142 insertions(+), 11 deletions(-)
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
