Commit b7d8912c authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-5.20-20220731' of... 

Merge tag 'linux-can-next-for-5.20-20220731' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next


Marc Kleine-Budde says:

====================
pull-request: can-next 2022-07-31

this is a pull request of 36 patches for net-next/master.

The 1st patch is by me and fixes a typo in the mcp251xfd driver.

Vincent Mailhol contributes a series of 9 patches, which clean up the
drivers to make use of KBUILD_MODNAME instead of hard coded names and
remove DRV_VERSION.

Followed by 3 patches by Vincent Mailhol that directly set the
ethtool_ops in instead of calling a function in the slcan, c_can and
flexcan driver.

Vincent Mailhol contributes a KBUILD_MODNAME and pr_fmt cleanup patch
for the slcan driver. Dario Binacchi contributes 6 patches to clean up
the driver and remove the legacy driver infrastructure.

The next 14 patches are by Vincent Mailhol and target the various
drivers, they add ethtool support and reporting of timestamping
capabilities.

Another patch by Vincent Mailhol for the etas_es58x driver to remove
useless calls to usb_fill_bulk_urb().

The last patch is by Christophe JAILLET and fixes a broken link to
Documentation in the can327 driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 63757225 7b584fbb

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -18470,6 +18470,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git 
F:	include/linux/sl?b*.h

F:	mm/sl?b*









SLCAN CAN NETWORK DRIVER









M:	Dario Binacchi <dario.binacchi@amarulasolutions.com>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/slcan/

















SLEEPABLE READ-COPY UPDATE (SRCU)









M:	Lai Jiangshan <jiangshanlai@gmail.com>









M:	"Paul E. McKenney" <paulmck@kernel.org>

























drivers/net/can/at91_can.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@

















#include <linux/clk.h>









#include <linux/errno.h>









#include <linux/ethtool.h>









#include <linux/if_arp.h>









#include <linux/interrupt.h>









#include <linux/kernel.h>








@@ -1152,6 +1153,10 @@ static const struct net_device_ops at91_netdev_ops = {







	.ndo_change_mtu = can_change_mtu,









};



















static const struct ethtool_ops at91_ethtool_ops = {









	.get_ts_info = ethtool_op_get_ts_info,









};



















static ssize_t mb0_id_show(struct device *dev,









			   struct device_attribute *attr, char *buf)









{








@@ -1293,6 +1298,7 @@ static int at91_can_probe(struct platform_device *pdev)







	}



















	dev->netdev_ops	= &at91_netdev_ops;









	dev->ethtool_ops = &at91_ethtool_ops;









	dev->irq = irq;









	dev->flags |= IFF_ECHO;










































drivers/net/can/c_can/c_can.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -223,7 +223,7 @@ int c_can_power_up(struct net_device *dev);







int c_can_power_down(struct net_device *dev);









#endif



















void c_can_set_ethtool_ops(struct net_device *dev);









extern const struct ethtool_ops c_can_ethtool_ops;



















static inline u8 c_can_get_tx_head(const struct c_can_tx_ring *ring)









{
































drivers/net/can/c_can/c_can_ethtool.c



+2
−6






























Original line number
Diff line number
Diff line







@@ -24,11 +24,7 @@ static void c_can_get_ringparam(struct net_device *netdev,







	ring->tx_pending = priv->msg_obj_tx_num;









}



















static const struct ethtool_ops c_can_ethtool_ops = {









const struct ethtool_ops c_can_ethtool_ops = {









	.get_ringparam = c_can_get_ringparam,









	.get_ts_info = ethtool_op_get_ts_info,









};


















void c_can_set_ethtool_ops(struct net_device *netdev)









{









	netdev->ethtool_ops = &c_can_ethtool_ops;









}
























drivers/net/can/c_can/c_can_main.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1364,7 +1364,7 @@ int register_c_can_dev(struct net_device *dev)

















	dev->flags |= IFF_ECHO;	/* we support local echo */









	dev->netdev_ops = &c_can_netdev_ops;









	c_can_set_ethtool_ops(dev);









	dev->ethtool_ops = &c_can_ethtool_ops;



















	return register_candev(dev);









}