Commit 95f3013e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-fixes-for-6.19-20251210' of... 

Merge tag 'linux-can-fixes-for-6.19-20251210' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2025-12-10

Arnd Bergmann's patch fixes a build dependency with the CAN protocols
and drivers introduced in the current development cycle.

The last patch is by me and fixes the error handling cleanup in the
gs_usb driver.

* tag 'linux-can-fixes-for-6.19-20251210' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: gs_usb: gs_can_open(): fix error handling
  can: fix build dependency
====================

Link: https://patch.msgid.link/20251210083448.2116869-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 898ae76a 3e54d3b4

drivers/net/can/Kconfig

+1 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



menuconfig CAN_DEV

	tristate "CAN Device Drivers"

	bool "CAN Device Drivers"

	default y

	depends on CAN

	help
@@ -17,9 +17,6 @@ menuconfig CAN_DEV 
	  virtual ones. If you own such devices or plan to use the virtual CAN

	  interfaces to develop applications, say Y here.



	  To compile as a module, choose M here: the module will be called

	  can-dev.



if CAN_DEV



config CAN_VCAN

drivers/net/can/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o 
obj-$(CONFIG_CAN_VXCAN)		+= vxcan.o

obj-$(CONFIG_CAN_SLCAN)		+= slcan/



obj-y				+= dev/

obj-$(CONFIG_CAN_DEV)		+= dev/

obj-y				+= esd/

obj-y				+= rcar/

obj-y				+= rockchip/

drivers/net/can/dev/Makefile

+2 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-$(CONFIG_CAN_DEV) += can-dev.o



can-dev-y += skb.o

obj-$(CONFIG_CAN) += can-dev.o



can-dev-$(CONFIG_CAN_DEV) += skb.o

can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o

can-dev-$(CONFIG_CAN_NETLINK) += bittiming.o

can-dev-$(CONFIG_CAN_NETLINK) += dev.o

drivers/net/can/usb/gs_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ static int gs_can_open(struct net_device *netdev) 
	usb_free_urb(urb);

out_usb_kill_anchored_urbs:

	if (!parent->active_channels) {

		usb_kill_anchored_urbs(&dev->tx_submitted);

		usb_kill_anchored_urbs(&parent->rx_submitted);



		if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)

			gs_usb_timestamp_stop(parent);

net/can/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


menuconfig CAN

	tristate "CAN bus subsystem support"

	select CAN_DEV

	help

	  Controller Area Network (CAN) is a slow (up to 1Mbit/s) serial

	  communications protocol. Development of the CAN bus started in